diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 00:15:39 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 00:15:39 +0000 |
| commit | 9aa33e851f4e0e01d302a3440111fd56e34aa664 (patch) | |
| tree | 81120bea45f2f20b0f6ac78473cab657af0c6524 /chrome/browser/io_thread.cc | |
| parent | 6c36d7f308d3596b70f8b1f90eef002d52dc380d (diff) | |
| download | chromium_src-9aa33e851f4e0e01d302a3440111fd56e34aa664.zip chromium_src-9aa33e851f4e0e01d302a3440111fd56e34aa664.tar.gz chromium_src-9aa33e851f4e0e01d302a3440111fd56e34aa664.tar.bz2 | |
Don't delete the IOThread globals until all of the MessageLoop::DestructionObservers have run (in case they try to access one of these pointers)
BUG=39723
Review URL: http://codereview.chromium.org/1638011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 30da91b..3f187e7 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -145,7 +145,7 @@ void IOThread::Init() { globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory()); } -void IOThread::CleanUp() { +void IOThread::CleanUpAfterMessageLoopDestruction() { // Not initialized in Init(). May not be initialized. if (dns_master_) { DCHECK(prefetch_observer_); @@ -187,7 +187,7 @@ void IOThread::CleanUp() { base::LeakTracker<URLFetcher>::CheckForLeaks(); base::LeakTracker<URLRequest>::CheckForLeaks(); - BrowserProcessSubThread::CleanUp(); + BrowserProcessSubThread::CleanUpAfterMessageLoopDestruction(); } net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory() { |