Convert PrerenderContents to use the new navigation callbacks.

chrome/browser/prerender/prerender_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 152 matching lines @@
   // |url| and |session_storage_namespace|.
   bool Matches(
       const GURL& url,
       const content::SessionStorageNamespace* session_storage_namespace) const;
 
   // content::WebContentsObserver implementation.
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
   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;
 
   void RenderProcessGone(base::TerminationStatus status) override;
 
   // content::NotificationObserver
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
@@ skipping 182 matching lines @@
   int64_t network_bytes_;
 
   base::WeakPtrFactory<PrerenderContents> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_