Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

chrome/browser/prerender/prerender_tracker.cc

Index: chrome/browser/prerender/prerender_tracker.cc
===================================================================
--- chrome/browser/prerender/prerender_tracker.cc	(revision 117096)
+++ chrome/browser/prerender/prerender_tracker.cc	(working copy)
@@ -20,18 +20,14 @@
 
 namespace {
 
-void CancelDeferredRequestOnIOThread(
-    ResourceDispatcherHost* resource_dispatcher_host,
-    int child_id, int request_id) {
+void CancelDeferredRequestOnIOThread(int child_id, int request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  resource_dispatcher_host->CancelRequest(child_id, request_id, false);
+  ResourceDispatcherHost::Get()->CancelRequest(child_id, request_id, false);
 }
 
-void StartDeferredRequestOnIOThread(
-    ResourceDispatcherHost* resource_dispatcher_host,
-    int child_id, int request_id) {
+void StartDeferredRequestOnIOThread(int child_id, int request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  resource_dispatcher_host->StartDeferredRequest(child_id, request_id);
+  ResourceDispatcherHost::Get()->StartDeferredRequest(child_id, request_id);
 }
 
 bool ShouldCancelRequest(
@@ -59,19 +55,14 @@
     int route_id,
     int request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ResourceDispatcherHost* resource_dispatcher_host =
-      g_browser_process->resource_dispatcher_host();
-  CHECK(resource_dispatcher_host);
   if (ShouldCancelRequest(child_id, route_id)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&CancelDeferredRequestOnIOThread, resource_dispatcher_host,
-                   child_id, request_id));
+        base::Bind(&CancelDeferredRequestOnIOThread, child_id, request_id));
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&StartDeferredRequestOnIOThread, resource_dispatcher_host,
-                   child_id, request_id));
+        base::Bind(&StartDeferredRequestOnIOThread, child_id, request_id));
   }
 }