Ensure that even if the HostResolver outlives the IO thread, its jobs will no...

chrome/browser/net/dns_global.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/dns_global.h"
 
 #include <map>
 #include <string>
 
 #include "base/singleton.h"
@@ skipping 426 matching lines @@
   }
 }
 
 void EnsureDnsPrefetchShutdown() {
   if (NULL != dns_master) {
     dns_master->Shutdown();
 
     // 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
   // BrowserMain() is to be called again.
   global_host_resolver = NULL;
 }
 
 void FreeDnsPrefetchResources() {
   DCHECK(NULL != dns_master);
   dns_master->Release();
@@ skipping 89 matching lines @@
   dns_master->DeserializeReferrers(*referral_list);
 }
 
 void TrimSubresourceReferrers() {
   if (NULL == dns_master)
     return;
   dns_master->TrimReferrers();
 }
 
 }  // namespace chrome_browser_net