diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-21 00:42:08 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-21 00:42:08 +0000 |
| commit | ac0102714758a061576fcf047961e68ab7747eec (patch) | |
| tree | 989f78f305ed279b08b5e82f4f84ef332542d862 | |
| parent | 22276887e669dd8f99d2fb34508d84b5003d802b (diff) | |
| download | chromium_src-ac0102714758a061576fcf047961e68ab7747eec.zip chromium_src-ac0102714758a061576fcf047961e68ab7747eec.tar.gz chromium_src-ac0102714758a061576fcf047961e68ab7747eec.tar.bz2 | |
Disable profile corruption detection on non Windows and Mac platforms.
On CrOs, this causes a crash in device ID initialization.
R=mad@chromium.org
TBR=mnissler
BUG=266569, 288210
TEST=NONE
Review URL: https://codereview.chromium.org/23990009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224537 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/prefs/pref_metrics_service.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc index 82af366..2ee5e1a 100644 --- a/chrome/browser/prefs/pref_metrics_service.cc +++ b/chrome/browser/prefs/pref_metrics_service.cc @@ -83,16 +83,14 @@ PrefMetricsService::PrefMetricsService(Profile* profile) // The following code might cause callbacks into this instance before we exit // the constructor. This instance should be initialized at this point. - - // Android has no GetDeviceId. -#if !defined(OS_ANDROID) +#if defined(OS_WIN) || defined(OS_MACOSX) // We need the machine id to compute pref value hashes. Fetch that, and then // call CheckTrackedPreferences in the callback. extensions::api::DeviceId::GetDeviceId( "PrefMetricsService", // non-empty string to obfuscate the device id. Bind(&PrefMetricsService::GetDeviceIdCallback, weak_factory_.GetWeakPtr())); -#endif // !defined(OS_ANDROID) +#endif // defined(OS_WIN) || defined(OS_MACOSX) } // For unit testing only. |