Renaming poorly named classes and adding missing unit tests.

chrome/browser/prerender/prerender_render_view_tracker.cc

Index: chrome/browser/prerender/prerender_render_view_tracker.cc
diff --git a/chrome/browser/prerender/prerender_tracker.cc b/chrome/browser/prerender/prerender_render_view_tracker.cc
similarity index 80%
rename from chrome/browser/prerender/prerender_tracker.cc
rename to chrome/browser/prerender/prerender_render_view_tracker.cc
index bcd95e69993d9079d90278e15d1daba87739aba8..8b09a7525dcdc4557b2466626e315fb3d614f933 100644
--- a/chrome/browser/prerender/prerender_tracker.cc
+++ b/chrome/browser/prerender/prerender_render_view_tracker.cc
@@ -2,7 +2,7 @@
 // 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_tracker.h"
+#include "chrome/browser/prerender/prerender_render_view_tracker.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -47,22 +47,20 @@ struct RenderViewInfo {
   base::WeakPtr<PrerenderManager> prerender_manager;
 };
 
-PrerenderTracker::PrerenderTracker() {
+PrerenderRenderViewTracker::PrerenderRenderViewTracker() {
 }
 
-PrerenderTracker::~PrerenderTracker() {
+PrerenderRenderViewTracker::~PrerenderRenderViewTracker() {
 }
 
-bool PrerenderTracker::TryUse(int child_id, int route_id) {
+bool PrerenderRenderViewTracker::TryUse(int child_id, int route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return SetFinalStatus(child_id, route_id, FINAL_STATUS_USED, NULL);
 }
 
-bool PrerenderTracker::TryCancel(
-    int child_id,
-    int route_id,
-    FinalStatus final_status) {
+bool PrerenderRenderViewTracker::TryCancel(
+    int child_id, int route_id, FinalStatus final_status) {
   DCHECK_NE(FINAL_STATUS_USED, final_status);
   DCHECK(final_status >= 0 && final_status < FINAL_STATUS_MAX);
 
@@ -72,10 +70,8 @@ bool PrerenderTracker::TryCancel(
          actual_final_status != FINAL_STATUS_MAX;
 }
 
-bool PrerenderTracker::TryCancelOnIOThread(
-    int child_id,
-    int route_id,
-    FinalStatus final_status) {
+bool PrerenderRenderViewTracker::TryCancelOnIOThread(
+    int child_id, int route_id, FinalStatus final_status) {
   DCHECK_NE(FINAL_STATUS_USED, final_status);
   DCHECK(final_status >= 0 && final_status < FINAL_STATUS_MAX);
 
@@ -84,8 +80,8 @@ bool PrerenderTracker::TryCancelOnIOThread(
   return TryCancel(child_id, route_id, final_status);
 }
 
-bool PrerenderTracker::GetFinalStatus(int child_id, int route_id,
-                                      FinalStatus* final_status) const {
+bool PrerenderRenderViewTracker::GetFinalStatus(
+    int child_id, int route_id, FinalStatus* final_status) const {
   ChildRouteIdPair child_route_id_pair(child_id, route_id);
 
   base::AutoLock lock(final_status_map_lock_);
@@ -97,7 +93,7 @@ bool PrerenderTracker::GetFinalStatus(int child_id, int route_id,
   return true;
 }
 
-void PrerenderTracker::OnPrerenderingStarted(
+void PrerenderRenderViewTracker::OnPrerenderingStarted(
     int child_id, int route_id, PrerenderManager* prerender_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_GE(child_id, 0);
@@ -119,7 +115,8 @@ void PrerenderTracker::OnPrerenderingStarted(
       std::make_pair(child_route_id_pair, RenderViewInfo(prerender_manager)));
 }
 
-void PrerenderTracker::OnPrerenderingFinished(int child_id, int route_id) {
+void PrerenderRenderViewTracker::OnPrerenderingFinished(int child_id,
+                                                        int route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_GE(child_id, 0);
   DCHECK_GE(route_id, 0);
@@ -135,9 +132,10 @@ void PrerenderTracker::OnPrerenderingFinished(int child_id, int route_id) {
   DCHECK_EQ(1u, num_erased);
 }
 
-bool PrerenderTracker::SetFinalStatus(int child_id, int route_id,
-                                      FinalStatus desired_final_status,
-                                      FinalStatus* actual_final_status) {
+bool PrerenderRenderViewTracker::SetFinalStatus(
+    int child_id, int route_id,
+    FinalStatus desired_final_status,
+    FinalStatus* actual_final_status) {
   DCHECK(desired_final_status >= FINAL_STATUS_USED &&
          desired_final_status < FINAL_STATUS_MAX);
 
@@ -173,8 +171,8 @@ bool PrerenderTracker::SetFinalStatus(int child_id, int route_id,
   return false;
 }
 
-bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id,
-                                                int route_id) const {
+bool PrerenderRenderViewTracker::IsPrerenderingOnIOThread(int child_id,
+                                                          int route_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ChildRouteIdPair child_route_id_pair(child_id, route_id);
@@ -182,7 +180,7 @@ bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id,
          possibly_prerendering_io_thread_set_.find(child_route_id_pair);
 }
 
-void PrerenderTracker::AddPrerenderOnIOThread(
+void PrerenderRenderViewTracker::AddPrerenderOnIOThread(
     const ChildRouteIdPair& child_route_id_pair) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!IsPrerenderingOnIOThread(child_route_id_pair.first,
@@ -191,7 +189,7 @@ void PrerenderTracker::AddPrerenderOnIOThread(
   possibly_prerendering_io_thread_set_.insert(child_route_id_pair);
 }
 
-void PrerenderTracker::RemovePrerenderOnIOThread(
+void PrerenderRenderViewTracker::RemovePrerenderOnIOThread(
     const ChildRouteIdPair& child_route_id_pair) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(IsPrerenderingOnIOThread(child_route_id_pair.first,
@@ -201,18 +199,18 @@ void PrerenderTracker::RemovePrerenderOnIOThread(
 }
 
 // static
-PrerenderTracker* PrerenderTracker::GetDefault() {
-  return g_browser_process->prerender_tracker();
+PrerenderRenderViewTracker* PrerenderRenderViewTracker::GetDefault() {
+  return g_browser_process->prerender_render_view_tracker();
 }
 
 // static
-void PrerenderTracker::AddPrerenderOnIOThreadTask(
+void PrerenderRenderViewTracker::AddPrerenderOnIOThreadTask(
     const ChildRouteIdPair& child_route_id_pair) {
   GetDefault()->AddPrerenderOnIOThread(child_route_id_pair);
 }
 
 // static
-void PrerenderTracker::RemovePrerenderOnIOThreadTask(
+void PrerenderRenderViewTracker::RemovePrerenderOnIOThreadTask(
     const ChildRouteIdPair& child_route_id_pair) {
   GetDefault()->RemovePrerenderOnIOThread(child_route_id_pair);
 }