Renaming poorly named classes and adding missing unit tests.

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 9f70bfe78854bd5748ac59d08d659704a7b21e18..c1308a6f3d75f9f797239701b94deaca241c616b 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"
-#include "chrome/browser/prerender/prerender_tracker.h"
+#include "chrome/browser/prerender/prerender_render_view_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -88,10 +88,12 @@ void InformRenderProcessAboutPrerender(const GURL& url,
 class PrerenderContentsFactoryImpl : public PrerenderContents::Factory {
  public:
   virtual PrerenderContents* CreatePrerenderContents(
-      PrerenderManager* prerender_manager, PrerenderTracker* prerender_tracker,
+      PrerenderManager* prerender_manager,
+      PrerenderRenderViewTracker* prerender_render_view_tracker,
       Profile* profile, const GURL& url, const content::Referrer& referrer,
       Origin origin, uint8 experiment_id) OVERRIDE {
-    return new PrerenderContents(prerender_manager, prerender_tracker, profile,
+    return new PrerenderContents(prerender_manager,
+                                 prerender_render_view_tracker, profile,
                                  url, referrer, origin, experiment_id);
   }
 };
@@ -236,7 +238,7 @@ void PrerenderContents::StartPendingPrerenders() {
 
 PrerenderContents::PrerenderContents(
     PrerenderManager* prerender_manager,
-    PrerenderTracker* prerender_tracker,
+    PrerenderRenderViewTracker* prerender_render_view_tracker,
     Profile* profile,
     const GURL& url,
     const content::Referrer& referrer,
@@ -244,7 +246,7 @@ PrerenderContents::PrerenderContents(
     uint8 experiment_id)
     : prerendering_has_started_(false),
       prerender_manager_(prerender_manager),
-      prerender_tracker_(prerender_tracker),
+      prerender_render_view_tracker_(prerender_render_view_tracker),
       prerender_url_(url),
       referrer_(referrer),
       profile_(profile),
@@ -332,7 +334,7 @@ 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.
-  prerender_tracker_->OnPrerenderingStarted(
+  prerender_render_view_tracker_->OnPrerenderingStarted(
       child_id_,
       route_id_,
       prerender_manager_);
@@ -403,7 +405,8 @@ PrerenderContents::~PrerenderContents() {
       final_status_);
 
   if (child_id_ != -1 && route_id_ != -1) {
-    prerender_tracker_->OnPrerenderingFinished(child_id_, route_id_);
+    prerender_render_view_tracker_->OnPrerenderingFinished(child_id_,
+                                                           route_id_);
     for (std::vector<GURL>::const_iterator it = alias_urls_.begin();
          it != alias_urls_.end();
          ++it) {
@@ -605,18 +608,18 @@ void PrerenderContents::Destroy(FinalStatus final_status) {
     return;
 
   if (child_id_ != -1 && route_id_ != -1) {
-    // Cancel the prerender in the PrerenderTracker.  This is needed
+    // Cancel the prerender in the PrerenderRenderViewTracker.  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 = prerender_tracker_->TryCancel(
+    bool is_cancelled = prerender_render_view_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 (!prerender_tracker_->GetFinalStatus(child_id_, route_id_,
-                                            &final_status)) {
+    if (!prerender_render_view_tracker_->GetFinalStatus(child_id_, route_id_,
+                                                        &final_status)) {
       NOTREACHED();
     }
   }