Make sure the "cancel leaked host resolver requests shutdown hack" gets run b...

chrome/browser/io_thread.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ skipping 43 matching lines @@
                      size_t max_concurrent,
                      const chrome_common_net::NameList& hostnames_to_prefetch,
                      ListValue* referral_list);
 
   // Handles changing to On The Record mode.  Posts a task for this onto the
   // IOThread's message loop.
   void ChangedToOnTheRecord();
 
  protected:
   virtual void Init();
+  virtual void CleanUp();
   virtual void CleanUpAfterMessageLoopDestruction();
 
  private:
   net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory();
 
   void InitDnsMasterOnIOThread(
       bool prefetching_enabled,
       base::TimeDelta max_queue_delay,
       size_t max_concurrent,
       chrome_common_net::NameList hostnames_to_prefetch,
       ListValue* referral_list);
 
   void ChangedToOnTheRecordOnIOThread();
 
   // These member variables are basically global, but their lifetimes are tied
   // to the IOThread.  IOThread owns them all, despite not using scoped_ptr.
   // This is because the destructor of IOThread runs on the wrong thread.  All
-  // member variables should be deleted in CleanUp().
+  // member variables should be deleted in CleanUp(), except ChromeNetLog
+  // which is deleted later in CleanUpAfterMessageLoopDestruction().
 
   // These member variables are initialized in Init() and do not change for the
   // lifetime of the IO thread.
 
   Globals* globals_;
 
+  // This variable is only meaningful during shutdown. It is used to defer
+  // deletion of the NetLog to CleanUpAfterMessageLoopDestruction() even
+  // though |globals_| is reset by CleanUp().
+  scoped_ptr<ChromeNetLog> deferred_net_log_to_delete_;
+
   // These member variables are initialized by a task posted to the IO thread,
   // which gets posted by calling certain member functions of IOThread.
 
   net::HostResolver::Observer* prefetch_observer_;
   chrome_browser_net::DnsMaster* dns_master_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_