Index: chrome/browser/prerender/prerender_manager.cc |
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc |
index 3b65e64a770715d5749b6b2cf51561e3fc091f0b..fd49ddd5aaf1b95246a95d17507c13bd49dc5308 100644 |
--- a/chrome/browser/prerender/prerender_manager.cc |
+++ b/chrome/browser/prerender/prerender_manager.cc |
@@ -30,7 +30,7 @@ |
#include "chrome/browser/prerender/prerender_local_predictor.h" |
#include "chrome/browser/prerender/prerender_manager_factory.h" |
#include "chrome/browser/prerender/prerender_tab_helper.h" |
-#include "chrome/browser/prerender/prerender_tracker.h" |
+#include "chrome/browser/prerender/prerender_render_view_tracker.h" |
#include "chrome/browser/prerender/prerender_util.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
@@ -249,11 +249,11 @@ class PrerenderManager::MostVisitedSites |
std::set<GURL> urls_; |
}; |
-PrerenderManager::PrerenderManager(Profile* profile, |
- PrerenderTracker* prerender_tracker) |
+PrerenderManager::PrerenderManager( |
+ Profile* profile, PrerenderRenderViewTracker* prerender_render_view_tracker) |
: enabled_(true), |
profile_(profile), |
- prerender_tracker_(prerender_tracker), |
+ prerender_render_view_tracker_(prerender_render_view_tracker), |
prerender_contents_factory_(PrerenderContents::CreateFactory()), |
last_prerender_start_time_(GetCurrentTimeTicks() - |
base::TimeDelta::FromMilliseconds(kMinTimeBetweenPrerendersMs)), |
@@ -445,7 +445,7 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents, |
// Try to set the prerendered page as used, so any subsequent attempts to |
// cancel on other threads will fail. If this fails because the prerender |
// was already cancelled, possibly on another thread, fail. |
- if (!prerender_tracker_->TryUse(child_id, route_id)) |
+ if (!prerender_render_view_tracker_->TryUse(child_id, route_id)) |
return false; |
if (!prerender_contents->load_start_time().is_null()) { |
@@ -1064,7 +1064,7 @@ PrerenderContents* PrerenderManager::CreatePrerenderContents( |
uint8 experiment_id) { |
DCHECK(CalledOnValidThread()); |
return prerender_contents_factory_->CreatePrerenderContents( |
- this, prerender_tracker_, profile_, url, |
+ this, prerender_render_view_tracker_, profile_, url, |
referrer, origin, experiment_id); |
} |