| commit | c277e2b0c28c0567de20b87d9aa6936bbedffb1a | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Aug 02 15:41:08 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Aug 02 15:41:08 2013 |
| tree | 8832ebda7ae06dfa8925b19bbf21f94b3d5ef100 | |
| parent | 2e313b4d471be66c1ddb09306a771783328f288e [diff] [blame] |
Re-land "Move CachingPermutedEntropyProvider to its own file." Reland of https://codereview.chromium.org/21127007/ The original CL changed a std::string to a const char* in a test, which resulted in saving a ref to a temporary that was later deref'd, which is now fixed in this CL. BUG=266007 TEST=Existing unit tests. [email protected],[email protected] NOTRY=true Review URL: https://chromiumcodereview.appspot.com/21893002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215291 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index a7a936b..c6328c6 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -89,7 +89,7 @@ #include "chrome/browser/ui/window_snapshot/window_snapshot.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/web_resource/promo_resource_service.h" -#include "chrome/common/metrics/entropy_provider.h" +#include "chrome/common/metrics/caching_permuted_entropy_provider.h" #include "chrome/common/pref_names.h" #include "components/autofill/core/browser/autofill_manager.h" #include "components/user_prefs/pref_registry_syncable.h"