Prerender/Instant interopability.

chrome/browser/prerender/prerender_manager.cc

 // Copyright (c) 2011 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_manager.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 504 matching lines @@
 }
 
 bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents,
                                              const GURL& url) {
   if (!PrerenderContents::UseTabContents()) {
     VLOG(1) << "Checking for prerender with LEGACY code";
     return PrerenderManager::MaybeUsePreloadedPageOld(tab_contents, url);
   }
   VLOG(1) << "Checking for prerender with NEW code";
   DCHECK(CalledOnValidThread());
+
   scoped_ptr<PrerenderContents> prerender_contents(
       GetEntryButNotSpecifiedTC(url, tab_contents));
   if (prerender_contents.get() == NULL)
     return false;
 
   // If we are just in the control group (which can be detected by noticing
   // that prerendering hasn't even started yet), record that |tab_contents| now
   // would be showing a prerendered contents, but otherwise, don't do anything.
   if (!prerender_contents->prerendering_has_started()) {
     MarkTabContentsAsWouldBePrerendered(tab_contents);
@@ skipping 32 matching lines @@
   DCHECK(old_tab_contents);
 
   MarkTabContentsAsPrerendered(new_tab_contents->tab_contents());
 
   // Merge the browsing history.
   new_tab_contents->controller().CopyStateFromAndPrune(
       &old_tab_contents->controller(),
       false);
   old_tab_contents->delegate()->SwapTabContents(old_tab_contents,
                                                 new_tab_contents);
+
   prerender_contents->CommitHistory(new_tab_contents->tab_contents());
 
   GURL icon_url = prerender_contents->icon_url();
   if (!icon_url.is_empty()) {
     std::vector<FaviconURL> urls;
     urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
     new_tab_contents->favicon_tab_helper()->OnUpdateFaviconURL(
         prerender_contents->page_id(),
         urls);
   }
@@ skipping 390 matching lines @@
   base::TimeTicks cutoff = GetCurrentTimeTicks() -
       base::TimeDelta::FromMilliseconds(kNavigationRecordWindowMs);
   while (!navigations_.empty()) {
     if (navigations_.front().time_ > cutoff)
       break;
     navigations_.pop_front();
   }
 }
 
 }  // namespace prerender