Remove a chrome dependency by removing Prerender from ResourceDispatcherHost.

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index ac050f17af16212f4603296080fb1fd4164af869..8e979e1d3649adb59b29211ab9e28f2e6a6bd7e8 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -31,6 +31,7 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_request_details.h"
+#include "content/browser/resource_context.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
@@ -186,9 +187,8 @@ void PrerenderContents::StartPrerenderingOld(
   // Register this with the PrerenderTracker as a prerendering RenderViewHost.
   // This must be done before the Navigate message to catch all resource
   // requests.
-  PrerenderTracker::GetInstance()->OnPrerenderingStarted(child_id_, route_id_,
-                                                         prerender_manager_);
-
+  g_browser_process->prerender_tracker()->OnPrerenderingStarted(
+      child_id_, route_id_, prerender_manager_);

[mmenke, 2011/05/23 21:58:41]

nit:  Should use the same line breaking style in both OnPrerenderingStarted
calls.

[dominich, 2011/05/23 22:22:55]

Done.

[jam, 2011/05/24 16:06:24]

nit: this is totally personal style, but for the record I prefer that when a
function has arguments that can all fit on one line, we do so.  the 80 line
limit makes the code very vertically heavy, and so if we can reduce some lines,
it makes it easier to read code without as much scrolling

   // Close ourselves when the application is shutting down.
   notification_registrar_.Add(this, NotificationType::APP_TERMINATING,
                               NotificationService::AllSources());
@@ -290,9 +290,9 @@ void PrerenderContents::StartPrerendering(
   // RenderViewHost. This must be done before the Navigate message to catch all
   // resource requests, but as it is on the same thread as the Navigate message
   // (IO) there is no race condition.
-  PrerenderTracker::GetInstance()->OnPrerenderingStarted(child_id_, route_id_,
-                                                         prerender_manager_);
-
+  g_browser_process->prerender_tracker()->OnPrerenderingStarted(
+      child_id_, route_id_,
+      prerender_manager_);
   // Close ourselves when the application is shutting down.
   notification_registrar_.Add(this, NotificationType::APP_TERMINATING,
                               NotificationService::AllSources());
@@ -377,7 +377,7 @@ PrerenderContents::~PrerenderContents() {
     render_view_host_->Shutdown();
 
   if (child_id_ != -1 && route_id_ != -1) {
-    PrerenderTracker::GetInstance()->OnPrerenderingFinished(
+    g_browser_process->prerender_tracker()->OnPrerenderingFinished(
         child_id_, route_id_);
   }
 
@@ -720,15 +720,14 @@ void PrerenderContents::Destroy(FinalStatus final_status) {
     // because destroy may be called directly from the UI thread without calling
     // TryCancel().  This is difficult to completely avoid, since prerendering
     // can be cancelled before a RenderView is created.
-    bool is_cancelled =
-        PrerenderTracker::GetInstance()->TryCancel(child_id_, route_id_,
-                                                   final_status);
+    bool is_cancelled = g_browser_process->prerender_tracker()->TryCancel(
+        child_id_, route_id_, final_status);
     CHECK(is_cancelled);
 
     // A different final status may have been set already from another thread.
     // If so, use it instead.
-    if (!PrerenderTracker::GetInstance()->GetFinalStatus(child_id_, route_id_,
-                                                         &final_status)) {
+    if (!g_browser_process->prerender_tracker()->GetFinalStatus(
+            child_id_, route_id_, &final_status)) {
       NOTREACHED();
     }
   }