Index: chrome/browser/browser_process_impl.cc |
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc |
index 314469fc28c89d598661d6d016e9e1b9aff7bb7a..a63eaca0bdd245218cb9d334e08252b5537317fd 100644 |
--- a/chrome/browser/browser_process_impl.cc |
+++ b/chrome/browser/browser_process_impl.cc |
@@ -895,7 +895,6 @@ void BrowserProcessImpl::CreateLocalState() { |
prefs::kMetricsReportingEnabled, |
base::Bind(&BrowserProcessImpl::ApplyMetricsReportingPolicy, |
base::Unretained(this))); |
- ApplyMetricsReportingPolicy(); |
#endif |
int max_per_proxy = local_state_->GetInteger(prefs::kMaxConnectionsPerProxy); |
@@ -925,6 +924,10 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { |
if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) |
ApplyDefaultBrowserPolicy(); |
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) |
+ ApplyMetricsReportingPolicy(); |
+#endif |
+ |
#if defined(ENABLE_PLUGINS) |
PluginService* plugin_service = PluginService::GetInstance(); |
plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); |
@@ -1050,11 +1053,11 @@ void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() { |
void BrowserProcessImpl::ApplyMetricsReportingPolicy() { |
#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) |
- BrowserThread::PostTask( |
+ CHECK(BrowserThread::PostTask( |
BrowserThread::FILE, FROM_HERE, |
base::Bind( |
base::IgnoreResult(&GoogleUpdateSettings::SetCollectStatsConsent), |
- local_state()->GetBoolean(prefs::kMetricsReportingEnabled))); |
+ local_state()->GetBoolean(prefs::kMetricsReportingEnabled)))); |
#endif |
} |