Kill CleanUpAfterMessageLoopDestruction.

chrome/browser/io_thread.cc

 // Copyright (c) 2011 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/io_thread.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/leak_tracker.h"
@@ skipping 421 matching lines @@
   speculative_interceptor_ = NULL;
 
   // TODO(eroman): hack for http://crbug.com/15513
   if (globals_->host_resolver->GetAsHostResolverImpl()) {
     globals_->host_resolver.get()->GetAsHostResolverImpl()->Shutdown();
   }
 
   delete globals_;
   globals_ = NULL;
 
+  // net::URLRequest instances must NOT outlive the IO thread.
+  base::debug::LeakTracker<net::URLRequest>::CheckForLeaks();

[eroman, 2011/03/02 02:23:31]

What has changed to make this safe?

If I remember correctly, this had to be done in
CleanupAfterMessageLoopDestruction because URLFetcher was releasing its
URLRequest from a destruction observer on the IO thread (and the destruction
observers don't run until AFTER CleanUp().

[willchan no longer on Chromium, 2011/03/02 05:31:16]

http://code.google.com/p/chromium/issues/detail?id=59630 documents how I fixed
them all. I think you reviewed most of those changes :)

If you search for DestructionObserver, you'll see that all the URLRequest
related ones are gone now.

+
+  // This will delete the |notification_service_|.  Make sure it's done after
+  // anything else can reference it.
   BrowserProcessSubThread::CleanUp();
 }
 
-void IOThread::CleanUpAfterMessageLoopDestruction() {
-  // This will delete the |notification_service_|.  Make sure it's done after
-  // anything else can reference it.
-  BrowserProcessSubThread::CleanUpAfterMessageLoopDestruction();
-
-  // net::URLRequest instances must NOT outlive the IO thread.
-  //
-  // To allow for URLRequests to be deleted from
-  // MessageLoop::DestructionObserver this check has to happen after CleanUp
-  // (which runs before DestructionObservers).
-  base::debug::LeakTracker<net::URLRequest>::CheckForLeaks();
-}
-
 // static
 void IOThread::RegisterPrefs(PrefService* local_state) {
   local_state->RegisterStringPref(prefs::kAuthSchemes,
                                   "basic,digest,ntlm,negotiate");
   local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup,
                                    false);
   local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false);
   local_state->RegisterStringPref(prefs::kAuthServerWhitelist, "");
   local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, "");
   local_state->RegisterStringPref(prefs::kGSSAPILibraryName, "");
@@ skipping 74 matching lines @@
 void IOThread::ClearHostCache() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (globals_->host_resolver->GetAsHostResolverImpl()) {
     net::HostCache* host_cache =
         globals_->host_resolver.get()->GetAsHostResolverImpl()->cache();
     if (host_cache)
       host_cache->clear();
   }
 }