Fix calls to PrerenderManager::RecordNavigation.

This was not recording most render-issued navigations after the change to swapping in prerenders after OpenURL.


Review URL: http://codereview.chromium.org/9834066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128767 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index dc0073c..9e081b9 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -330,7 +330,6 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
                                                const GURL& url) {
   DCHECK(CalledOnValidThread());
   DCHECK(!IsWebContentsPrerendering(web_contents));
-  RecordNavigation(url);
 
   scoped_ptr<PrerenderContents> prerender_contents(
       GetEntryButNotSpecifiedWC(url, web_contents));
@@ -478,6 +477,7 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
   // TODO(cbentzel): Should prerender_contents move to the pending delete
   //                 list, instead of deleting directly here?
   AddToHistory(prerender_contents.get());
+  RecordNavigation(url);
   return true;
 }
 
@@ -824,6 +824,13 @@ bool PrerenderManager::IsPrerendering(const GURL& url) const {
   return (FindEntry(url) != NULL);
 }
 
+void PrerenderManager::RecordNavigation(const GURL& url) {
+  DCHECK(CalledOnValidThread());
+
+  navigations_.push_back(NavigationRecord(url, GetCurrentTimeTicks()));
+  CleanUpOldNavigations();
+}
+
 // protected
 void PrerenderManager::SetPrerenderContentsFactory(
     PrerenderContents::Factory* prerender_contents_factory) {
@@ -1185,13 +1192,6 @@ void PrerenderManager::AddToHistory(PrerenderContents* contents) {
   prerender_history_->AddEntry(entry);
 }
 
-void PrerenderManager::RecordNavigation(const GURL& url) {
-  DCHECK(CalledOnValidThread());
-
-  navigations_.push_back(NavigationRecord(url, GetCurrentTimeTicks()));
-  CleanUpOldNavigations();
-}
-
 Value* PrerenderManager::GetActivePrerendersAsValue() const {
   ListValue* list_value = new ListValue();
   for (PrerenderContentsDataList::const_iterator it = prerender_list_.begin();