Renaming poorly named classes and adding missing unit tests.

chrome/browser/prerender/prerender_unittest.cc

Index: chrome/browser/prerender/prerender_unittest.cc
diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc
index dc5cad031bc9776fcbcb52c844dd56529eb79790..0b353b3660924d888f7f3a30775b42aecd383023 100644
--- a/chrome/browser/prerender/prerender_unittest.cc
+++ b/chrome/browser/prerender/prerender_unittest.cc
@@ -28,12 +28,11 @@ namespace {
 
 class DummyPrerenderContents : public PrerenderContents {
  public:
-  DummyPrerenderContents(PrerenderManager* prerender_manager,
-                         PrerenderTracker* prerender_tracker,
-                         const GURL& url,
-                         Origin origin,
-                         FinalStatus expected_final_status)
-      : PrerenderContents(prerender_manager, prerender_tracker,
+  DummyPrerenderContents(
+      PrerenderManager* prerender_manager,
+      PrerenderRenderViewTracker* prerender_render_view_tracker,
+      const GURL& url, Origin origin, FinalStatus expected_final_status)
+      : PrerenderContents(prerender_manager, prerender_render_view_tracker,
                           NULL, url, Referrer(), origin,
                           PrerenderManager::kNoExperiment),
         expected_final_status_(expected_final_status) {
@@ -73,12 +72,13 @@ class DummyPrerenderContents : public PrerenderContents {
 
 class TestPrerenderManager : public PrerenderManager {
  public:
-  explicit TestPrerenderManager(PrerenderTracker* prerender_tracker)
-      : PrerenderManager(&profile_, prerender_tracker),
+  explicit TestPrerenderManager(
+      PrerenderRenderViewTracker* prerender_render_view_tracker)
+      : PrerenderManager(&profile_, prerender_render_view_tracker),
         time_(base::Time::Now()),
         time_ticks_(base::TimeTicks::Now()),
         next_prerender_contents_(NULL),
-        prerender_tracker_(prerender_tracker) {
+        prerender_render_view_tracker_(prerender_render_view_tracker) {
     set_rate_limit_enabled(false);
   }
 
@@ -111,7 +111,7 @@ class TestPrerenderManager : public PrerenderManager {
       const GURL& url,
       FinalStatus expected_final_status) {
     DummyPrerenderContents* prerender_contents =
-        new DummyPrerenderContents(this, prerender_tracker_, url,
+        new DummyPrerenderContents(this, prerender_render_view_tracker_, url,
                                    ORIGIN_LINK_REL_PRERENDER,
                                    expected_final_status);
     SetNextPrerenderContents(prerender_contents);
@@ -123,7 +123,7 @@ class TestPrerenderManager : public PrerenderManager {
       Origin origin,
       FinalStatus expected_final_status) {
     DummyPrerenderContents* prerender_contents =
-        new DummyPrerenderContents(this, prerender_tracker_, url,
+        new DummyPrerenderContents(this, prerender_render_view_tracker_, url,
                                    origin, expected_final_status);
     SetNextPrerenderContents(prerender_contents);
     return prerender_contents;
@@ -134,7 +134,7 @@ class TestPrerenderManager : public PrerenderManager {
       const std::vector<GURL>& alias_urls,
       FinalStatus expected_final_status) {
     DummyPrerenderContents* prerender_contents =
-        new DummyPrerenderContents(this, prerender_tracker_, url,
+        new DummyPrerenderContents(this, prerender_render_view_tracker_, url,
                                    ORIGIN_LINK_REL_PRERENDER,
                                    expected_final_status);
     for (std::vector<GURL>::const_iterator it = alias_urls.begin();
@@ -188,7 +188,7 @@ class TestPrerenderManager : public PrerenderManager {
   // tracked so they will be automatically deleted.
   ScopedVector<PrerenderContents> used_prerender_contents_;
 
-  PrerenderTracker* prerender_tracker_;
+  PrerenderRenderViewTracker* prerender_render_view_tracker_;
 
   TestingProfile profile_;
 };
@@ -210,12 +210,13 @@ class PrerenderTest : public testing::Test {
   static const int kDefaultChildId = -1;
   static const int kDefaultRenderViewRouteId = -1;
 
-  PrerenderTest() : ui_thread_(BrowserThread::UI, &message_loop_),
-                    prerender_manager_(
-                        new TestPrerenderManager(prerender_tracker())),
-                    prerender_link_manager_(
-                        new PrerenderLinkManager(prerender_manager_.get())),
-                    last_prerender_id_(0) {
+  PrerenderTest()
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        prerender_manager_(
+            new TestPrerenderManager(prerender_render_view_tracker())),
+        prerender_link_manager_(
+            new PrerenderLinkManager(prerender_manager_.get())),
+        last_prerender_id_(0) {
     // Enable omnibox prerendering.
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kPrerenderFromOmnibox,
@@ -251,8 +252,8 @@ class PrerenderTest : public testing::Test {
   }
 
  private:
-  PrerenderTracker* prerender_tracker() {
-    return g_browser_process->prerender_tracker();
+  PrerenderRenderViewTracker* prerender_render_view_tracker() {
+    return g_browser_process->prerender_render_view_tracker();
   }
 
   // Needed to pass PrerenderManager's DCHECKs.