| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index ebfc6a490395d56dc417d132156374c375d85e7f..5549756d22266768eded8e423578f1802a15aeb4 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -833,11 +833,8 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
|
| registry->RegisterStringPref(prefs::kHardwareKeyboardLayout,
|
| std::string());
|
| #endif // defined(OS_CHROMEOS)
|
| -#if !defined(OS_CHROMEOS)
|
| registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
|
| GoogleUpdateSettings::GetCollectStatsConsent());
|
| -#endif // !defined(OS_CHROMEOS)
|
| -
|
| #if defined(OS_ANDROID)
|
| registry->RegisterBooleanPref(
|
| prefs::kCrashReportingEnabled, false);
|
| @@ -1015,7 +1012,7 @@ void BrowserProcessImpl::CreateLocalState() {
|
|
|
| // This preference must be kept in sync with external values; update them
|
| // whenever the preference or its controlling policy changes.
|
| -#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| pref_change_registrar_.Add(
|
| metrics::prefs::kMetricsReportingEnabled,
|
| base::Bind(&BrowserProcessImpl::ApplyMetricsReportingPolicy,
|
| @@ -1054,7 +1051,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
| if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
|
| ApplyDefaultBrowserPolicy();
|
|
|
| -#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| ApplyMetricsReportingPolicy();
|
| #endif
|
|
|
| @@ -1216,7 +1213,7 @@ void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() {
|
| }
|
|
|
| void BrowserProcessImpl::ApplyMetricsReportingPolicy() {
|
| -#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| CHECK(BrowserThread::PostTask(
|
| BrowserThread::FILE, FROM_HERE,
|
| base::Bind(
|
|
|