Remove a chrome dependency by removing Prerender from ResourceDispatcherHost.

chrome/browser/prerender/prerender_contents.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/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/process_util.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
 #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"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/mach_broker_mac.h"
 #endif
@@ skipping 135 matching lines @@
   PrerenderRenderWidgetHostView* view =
       new PrerenderRenderWidgetHostView(render_view_host_, this);
   view->Init(source_render_view_host->view());
 
   child_id_ = render_view_host_->process()->id();
   route_id_ = render_view_host_->routing_id();
 
   // 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(

[cbentzel, 2011/05/24 11:37:19]

Would it make more sense to pass the PrerenderTracker* into the PrerenderManager
[and in turn the PrerenderContents object]

[dominich, 2011/05/24 15:10:28]

I prefer to be explicit about where this is coming from rather than muddy the
waters of ownership. The lookup here is very low cost compared to the other
processing we're doing and it makes it obvious that we're calling out to
something global.

[cbentzel, 2011/05/24 15:13:25]

I wasn't worried about performance, just dislike reaching out to the global
instead of passing in the dependency.

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

I don't think this makes ownership murky.  It's a very common pattern that we
give objects on creation the other objects that they might need.  Otherwise
BrowserProcess will explode with a list of getters.

[dominich, 2011/05/24 16:54:21]

Done.

+      child_id_,
+      route_id_,
+      prerender_manager_);
 
   // Close ourselves when the application is shutting down.
   notification_registrar_.Add(this, NotificationType::APP_TERMINATING,
                               NotificationService::AllSources());
 
   // Register for our parent profile to shutdown, so we can shut ourselves down
   // as well (should only be called for OTR profiles, as we should receive
   // APP_TERMINATING before non-OTR profiles are destroyed).
   // TODO(tburkard): figure out if this is needed.
   notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
@@ skipping 82 matching lines @@
   render_view_host_observer_.reset(
       new PrerenderRenderViewHostObserver(this, render_view_host_mutable()));
 
   child_id_ = render_view_host()->process()->id();
   route_id_ = render_view_host()->routing_id();
 
   // Register this with the ResourceDispatcherHost as a prerender
   // 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());
 
   // Register for our parent profile to shutdown, so we can shut ourselves down
   // as well (should only be called for OTR profiles, as we should receive
   // APP_TERMINATING before non-OTR profiles are destroyed).
   // TODO(tburkard): figure out if this is needed.
   notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
@@ skipping 65 matching lines @@
   // If we haven't even started prerendering, we were just in the control
   // group, which means we do not want to record the status.
   if (prerendering_has_started())
     RecordFinalStatus(final_status_);
 
   // Only delete the RenderViewHost if we own it.
   if (render_view_host_)
     render_view_host_->Shutdown();
 
   if (child_id_ != -1 && route_id_ != -1) {
-    PrerenderTracker::GetInstance()->OnPrerenderingFinished(
+    g_browser_process->prerender_tracker()->OnPrerenderingFinished(
         child_id_, route_id_);
   }
 
   // If we still have a TabContents, clean up anything we need to and then
   // destroy it.
   if (prerender_contents_.get())
     delete ReleasePrerenderContents();
 }
 
 RenderViewHostDelegate::View* PrerenderContents::GetViewDelegate() {
@@ skipping 322 matching lines @@
 
 void PrerenderContents::Destroy(FinalStatus final_status) {
   if (prerender_manager_->IsPendingDelete(this))
     return;
 
   if (child_id_ != -1 && route_id_ != -1) {
     // Cancel the prerender in the PrerenderTracker.  This is needed
     // 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();
     }
   }
 
   prerender_manager_->MoveEntryToPendingDelete(this);
   set_final_status(final_status);
   // We may destroy the PrerenderContents before we have initialized the
   // RenderViewHost. Otherwise set the Observer's PrerenderContents to NULL to
   // avoid any more messages being sent.
   if (render_view_host_observer_.get())
@@ skipping 83 matching lines @@
   }
   return render_view_host_;
 }
 
 void PrerenderContents::CommitHistory(TabContents* tc) {
   if (tab_contents_delegate_.get())
     tab_contents_delegate_->CommitHistory(tc);
 }
 
 }  // namespace prerender