Renaming poorly named classes and adding missing unit tests.

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2012 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"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/history/history_types.h"
 #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"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/browser_child_process_host.h"
@@ skipping 53 matching lines @@
   else
     message = new PrerenderMsg_RemovePrerenderURL(url);
   render_process_host->Send(message);
 }
 
 }  // namespace
 
 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);
   }
 };
 
 struct PrerenderContents::PendingPrerenderInfo {
   PendingPrerenderInfo(const GURL& url,
                        const content::Referrer& referrer,
                        const gfx::Size& size);
   const GURL url;
   const content::Referrer referrer;
@@ skipping 124 matching lines @@
   for (PendingPrerenderList::iterator it = pending_prerender_list.begin();
        it != pending_prerender_list.end();
        ++it) {
     prerender_manager_->AddPrerenderFromLinkRelPrerender(
         child_id_, route_id_, it->url, it->referrer, it->size);
   }
 }
 
 PrerenderContents::PrerenderContents(
     PrerenderManager* prerender_manager,
-    PrerenderTracker* prerender_tracker,
+    PrerenderRenderViewTracker* prerender_render_view_tracker,
     Profile* profile,
     const GURL& url,
     const content::Referrer& referrer,
     Origin origin,
     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),
       page_id_(0),
       has_stopped_loading_(false),
       has_finished_loading_(false),
       final_status_(FINAL_STATUS_MAX),
       match_complete_status_(MATCH_COMPLETE_DEFAULT),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
@@ skipping 67 matching lines @@
   render_view_host_observer_.reset(
       new PrerenderRenderViewHostObserver(this, GetRenderViewHostMutable()));
 
   child_id_ = GetRenderViewHost()->GetProcess()->GetID();
   route_id_ = GetRenderViewHost()->GetRoutingID();
 
   // 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.
-  prerender_tracker_->OnPrerenderingStarted(
+  prerender_render_view_tracker_->OnPrerenderingStarted(
       child_id_,
       route_id_,
       prerender_manager_);
 
   // Close ourselves when the application is shutting down.
   notification_registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                               content::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
@@ skipping 50 matching lines @@
          final_status_ == FINAL_STATUS_USED);
   DCHECK(origin_ != ORIGIN_MAX);
 
   prerender_manager_->RecordFinalStatusWithMatchCompleteStatus(
       origin_,
       experiment_id_,
       match_complete_status_,
       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) {
       InformRenderProcessAboutPrerender(*it, false, creator_child_id_);
     }
   }
 
   // If we still have a WebContents, clean up anything we need to and then
   // destroy it.
   if (prerender_contents_.get())
@@ skipping 181 matching lines @@
   // page, so cancel this prerender.
   Destroy(FINAL_STATUS_JAVASCRIPT_ALERT);
   return true;
 }
 
 void PrerenderContents::Destroy(FinalStatus final_status) {
   if (prerendering_has_been_cancelled_)
     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();
     }
   }
   set_final_status(final_status);
 
   prerendering_has_been_cancelled_ = true;
   // This has to be done after setting the final status, as it adds the
   // prerender to the history.
   prerender_manager_->MoveEntryToPendingDelete(this, final_status);
 
@@ skipping 78 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->web_contents())
     return false;
   const WebContents* web_contents = prerender_contents_->web_contents();
   return (web_contents->GetSiteInstance() !=
           web_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender