diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 14:25:54 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 14:25:54 +0000 |
| commit | fc0cd317397584132b446d5522b55e6005926189 (patch) | |
| tree | 7bb0383ae58bd038bc3f8b4c8d4b72cb67261f8a /chrome/browser/browser_process_impl.cc | |
| parent | e1803f813ab90579c8c6f58e75be215c7ab88af3 (diff) | |
| download | chromium_src-fc0cd317397584132b446d5522b55e6005926189.zip chromium_src-fc0cd317397584132b446d5522b55e6005926189.tar.gz chromium_src-fc0cd317397584132b446d5522b55e6005926189.tar.bz2 | |
Delay setting the consent to send settings until after threads are running
BUG=333847
R=joaodasilva@chromium.org
Review URL: https://codereview.chromium.org/136713002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 314469f..a63eaca 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 } |