diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 22:11:33 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 22:11:33 +0000 |
| commit | 5cdd378c4349b1f1bec213c3f97d012fb845ec18 (patch) | |
| tree | bc3c5d6eee129506b22b8a113adacbbbb2b65c2b | |
| parent | bb17709d52b1362413936faa216107c67e9de897 (diff) | |
| download | chromium_src-5cdd378c4349b1f1bec213c3f97d012fb845ec18.zip chromium_src-5cdd378c4349b1f1bec213c3f97d012fb845ec18.tar.gz chromium_src-5cdd378c4349b1f1bec213c3f97d012fb845ec18.tar.bz2 | |
Merge 244499 "Delay setting the consent to send settings until a..."
> 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
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/137453002
git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@244594 0039d316-1c4b-4281-b951-d872f2087c98
| -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 74597c3..222e139 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -889,7 +889,6 @@ void BrowserProcessImpl::CreateLocalState() { prefs::kMetricsReportingEnabled, base::Bind(&BrowserProcessImpl::ApplyMetricsReportingPolicy, base::Unretained(this))); - ApplyMetricsReportingPolicy(); #endif int max_per_proxy = local_state_->GetInteger(prefs::kMaxConnectionsPerProxy); @@ -919,6 +918,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()); @@ -1044,11 +1047,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 } |