diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-02 01:57:36 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-02 01:57:36 +0000 |
| commit | ad94f720552aa136a5fee4e936886b80924abf05 (patch) | |
| tree | 52bfe9c86a4a89edd6283511ee7608f414501c3c /chrome/browser/browser_process_impl.cc | |
| parent | 077c5dfdd61b3f296b6657f75332873ebe32bfff (diff) | |
| download | chromium_src-ad94f720552aa136a5fee4e936886b80924abf05.zip chromium_src-ad94f720552aa136a5fee4e936886b80924abf05.tar.gz chromium_src-ad94f720552aa136a5fee4e936886b80924abf05.tar.bz2 | |
In some tests the component updater singleton might be called first from the IO thread which is not expected.
This is observed today.
BUG=none
TBR=jam
Review URL: https://codereview.chromium.org/56743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 92a4707..eee9406 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -785,6 +785,8 @@ prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() { ComponentUpdateService* BrowserProcessImpl::component_updater() { if (!component_updater_.get()) { + if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) + return NULL; ComponentUpdateService::Configurator* configurator = MakeChromeComponentUpdaterConfigurator( CommandLine::ForCurrentProcess(), |