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 17 matching lines @@
            url.query() == url_.query();
   }
   GURL url_;
 };
 
 }  // end namespace
 
 class PrerenderContentsFactoryImpl : public PrerenderContents::Factory {
  public:
   virtual PrerenderContents* CreatePrerenderContents(
-      PrerenderManager* prerender_manager, Profile* profile, const GURL& url,
+      PrerenderManager* prerender_manager, Profile* profile,
+      PrerenderTracker* prerender_tracker,
+      const GURL& url,
       const GURL& referrer) OVERRIDE {
-    return new PrerenderContents(prerender_manager, profile, url, referrer);
+    return new PrerenderContents(prerender_manager, profile, prerender_tracker,
+                                 url, referrer);
   }
 };
 
 // TabContentsDelegateImpl -----------------------------------------------------
 
 class PrerenderContents::TabContentsDelegateImpl
     : public TabContentsDelegate {
  public:
   explicit TabContentsDelegateImpl(PrerenderContents* prerender_contents) :
       prerender_contents_(prerender_contents) {
@@ skipping 34 matching lines @@
       AddPageVector;
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   PrerenderContents* prerender_contents_;
 };
 
 PrerenderContents::PrerenderContents(PrerenderManager* prerender_manager,
                                      Profile* profile,
+                                     PrerenderTracker* prerender_tracker,
                                      const GURL& url,
                                      const GURL& referrer)
     : prerender_manager_(prerender_manager),
       render_view_host_(NULL),
       prerender_url_(url),
       referrer_(referrer),
       profile_(profile),
+      prerender_tracker_(prerender_tracker),
       page_id_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(tab_contents_observer_registrar_(this)),
       has_stopped_loading_(false),
       final_status_(FINAL_STATUS_MAX),
       prerendering_has_started_(false),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
       route_id_(-1),
       starting_page_id_(-1) {
   DCHECK(prerender_manager != NULL);
@@ skipping 35 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_);
+  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 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_);
+  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 68 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(
+    prerender_tracker_->OnPrerenderingFinished(

[mmenke, 2011/05/24 17:56:22]

nit:  This now fits on a single line.

[dominich, 2011/05/24 18:01:47]

Done.

         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 325 matching lines @@
     return;
 
   prerendering_has_been_cancelled_ = true;
   prerender_manager_->MoveEntryToPendingDelete(this);
 
   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 = 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 (!prerender_tracker_->GetFinalStatus(child_id_, route_id_,
+                                            &final_status)) {
       NOTREACHED();
     }
   }
   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())
     render_view_host_observer_->set_prerender_contents(NULL);
@@ skipping 82 matching lines @@
   }
   return render_view_host_;
 }
 
 void PrerenderContents::CommitHistory(TabContents* tc) {
   if (tab_contents_delegate_.get())
     tab_contents_delegate_->CommitHistory(tc);
 }
 
 }  // namespace prerender