Change the lifetime of the WebKit thread to be a subset of the IO thread's li...

chrome/browser/renderer_host/resource_dispatcher_host.h

 // 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.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then fowards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 274 matching lines @@
 
   SaveFileManager* save_file_manager() const {
     return save_file_manager_;
   }
 
   SafeBrowsingService* safe_browsing_service() const {
     return safe_browsing_;
   }
 
   WebKitThread* webkit_thread() const {
-    return webkit_thread_;
+    return webkit_thread_.get();
   }
 
   MessageLoop* ui_loop() const { return ui_loop_; }
 
   // Called when the onunload handler for a cross-site request has finished.
   void OnClosePageACK(int process_id, int request_id);
 
   // Force cancels any pending requests for the given process.
   void CancelRequestsForProcess(int process_id);
 
@@ skipping 216 matching lines @@
   scoped_refptr<DownloadFileManager> download_file_manager_;
 
   // Determines whether a download is allowed.
   scoped_refptr<DownloadRequestManager> download_request_manager_;
 
   // We own the save file manager.
   scoped_refptr<SaveFileManager> save_file_manager_;
 
   scoped_refptr<SafeBrowsingService> safe_browsing_;
 
-  scoped_refptr<WebKitThread> webkit_thread_;
+  // We own the WebKit thread and see to its destruction.
+  scoped_ptr<WebKitThread> webkit_thread_;
 
   // Request ID for browser initiated requests. request_ids generated by
   // child processes are counted up from 0, while browser created requests
   // start at -2 and go down from there. (We need to start at -2 because -1 is
   // used as a special value all over the resource_dispatcher_host for
   // uninitialized variables.) This way, we no longer have the unlikely (but
   // observed in the real world!) event where we have two requests with the same
   // request_id_.
   int request_id_;
 
@@ skipping 30 matching lines @@
   // Used during IPC message dispatching so that the handlers can get a pointer
   // to the source of the message.
   Receiver* receiver_;
 
   static bool g_is_http_prioritization_enabled;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHost);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_