Convert PrerenderContents to use the new navigation callbacks.

chrome/browser/prerender/prerender_contents.h

Index: chrome/browser/prerender/prerender_contents.h
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 3d2a82c63296d0c7b77b719b0eae477a8799fb21..1926ce3a0fe8e7cf5f247745a22367c13a326385 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -170,15 +170,12 @@ class PrerenderContents : public content::NotificationObserver,
   void DidStopLoading() override;
   void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override;
-  void DidStartProvisionalLoadForFrame(
-      content::RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      bool is_error_page) override;
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
                      const GURL& validated_url) override;
-  void DidNavigateMainFrame(

[pasko, 2017/01/25 17:34:28]

note: there is a concurrent review that changes behavior of
DidNavigateMainFrame() and is aiming to fix a beta blocker:
https://codereview.chromium.org/2656653002/

Can we wait with this one until that lands to reduce conflicts during merge to
beta?

[jam, 2017/01/25 18:13:18]

Sure, I'll wait for that cl to land before committing this.

-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void DidGetRedirectForResourceRequest(
       const content::ResourceRedirectDetails& details) override;