summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-27 08:29:50 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-27 08:29:50 +0000
commita1e646a13a0041b19b9e55fef1d7d228835cde3d (patch)
tree23d026ae4e07050f5a43ba009f2bee852224b952 /chrome/browser
parenteb9b19800a9341d18ca777824edad31a4e3b205b (diff)
downloadchromium_src-a1e646a13a0041b19b9e55fef1d7d228835cde3d.zip
chromium_src-a1e646a13a0041b19b9e55fef1d7d228835cde3d.tar.gz
chromium_src-a1e646a13a0041b19b9e55fef1d7d228835cde3d.tar.bz2
Ensure that even if the HostResolver outlives the IO thread, its jobs will not try to complete on the IO thread.
This is an experiment for http://crbug.com/15513 BUG=15513 TBR=willchan Review URL: http://codereview.chromium.org/150001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/net/dns_global.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/dns_global.cc
index 795b79d..379bf0f 100644
--- a/chrome/browser/net/dns_global.cc
+++ b/chrome/browser/net/dns_global.cc
@@ -444,6 +444,9 @@ void EnsureDnsPrefetchShutdown() {
// Stop observing DNS resolutions. Note that dns_master holds a reference
// to the global host resolver, so is guaranteed to be live.
GetGlobalHostResolver()->RemoveObserver(&dns_resolution_observer);
+
+ // TODO(eroman): temp hack for http://crbug.com/15513
+ GetGlobalHostResolver()->Shutdown();
}
// TODO(eroman): This is a hack so the in process browser tests work if