Convert PrerenderTabHelper to use the new navigation callbacks.

chrome/browser/prerender/prerender_tab_helper.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_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "chrome/browser/prerender/prerender_histograms.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/web_contents.h"
 
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(prerender::PrerenderTabHelper);
 
 namespace prerender {
 
 PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       origin_(ORIGIN_NONE),
       weak_factory_(this) {}
 
 PrerenderTabHelper::~PrerenderTabHelper() {
 }
 
 void PrerenderTabHelper::DidGetRedirectForResourceRequest(
     const content::ResourceRedirectDetails& details) {
   if (details.resource_type != content::RESOURCE_TYPE_MAIN_FRAME)
     return;
 
   MainFrameUrlDidChange(details.new_url);
 }
 
-void PrerenderTabHelper::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    ui::PageTransition transition_type) {
-  if (render_frame_host->GetParent())
+void PrerenderTabHelper::DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() ||
+      !navigation_handle->HasCommitted() ||
+      navigation_handle->IsErrorPage()) {
     return;
-  url_ = validated_url;
+  }
+
+  url_ = navigation_handle->GetURL();
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return;
   if (prerender_manager->IsWebContentsPrerendering(web_contents(), NULL))
     return;
-  prerender_manager->RecordNavigation(validated_url);
+  prerender_manager->RecordNavigation(navigation_handle->GetURL());

[pasko, 2017/01/26 10:49:03]

nit: why not use url_? methods called in between should not affect the url_

[jam, 2017/01/26 15:50:28]

I was thrown off by the existing code, but I didn't bother tracing it further.
You're right though, updated.

 }
 
 void PrerenderTabHelper::DidStopLoading() {
   // Compute the PPLT metric and report it in a histogram, if needed. If the
   // page is still prerendering, record the not swapped in page load time
   // instead.
   if (!pplt_load_start_.is_null()) {
     base::TimeTicks now = GetTimeTicksFromPrerenderManager();
     if (IsPrerendering()) {
       PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
@@ skipping 20 matching lines @@
       RecordPerceivedPageLoadTime(
           now - pplt_load_start_, fraction_elapsed_at_swapin);
     }
   }
 
   // Reset the PPLT metric.
   pplt_load_start_ = base::TimeTicks();
   actual_load_start_ = base::TimeTicks();
 }
 
-void PrerenderTabHelper::DidStartProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    bool is_error_page) {
+void PrerenderTabHelper::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (navigation_handle->IsSamePage())
+    return;
+
   // Determine the navigation type.
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (prerender_manager &&
       prerender_manager->IsWebContentsPrerendering(web_contents(), &origin_)) {
     navigation_type_ = NAVIGATION_TYPE_PRERENDERED;
   } else {
     navigation_type_ = NAVIGATION_TYPE_NORMAL;
   }
 
-  if (render_frame_host->GetParent())
+  if (!navigation_handle->IsInMainFrame())
     return;
 
   // Record PPLT state for the beginning of a new navigation.
   pplt_load_start_ = GetTimeTicksFromPrerenderManager();
   actual_load_start_ = base::TimeTicks();
 
-  MainFrameUrlDidChange(validated_url);
+  MainFrameUrlDidChange(navigation_handle->GetURL());
 }
 
 void PrerenderTabHelper::MainFrameUrlDidChange(const GURL& url) {
   url_ = url;
 }
 
 PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const {
   return PrerenderManagerFactory::GetForBrowserContext(
       web_contents()->GetBrowserContext());
 }
@@ skipping 40 matching lines @@
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return;
 
   prerender_manager->RecordPerceivedPageLoadTime(
       origin_, navigation_type_, perceived_page_load_time,
       fraction_plt_elapsed_at_swap_in, url_);
 }
 
 }  // namespace prerender