Convert AwRenderViewHostExt to use the new navigation callbacks.

android_webview/browser/renderer_host/aw_render_view_host_ext.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 ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
 
 #include "content/public/browser/web_contents_observer.h"
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/threading/non_thread_safe.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_f.h"
 
-namespace content {
-struct FrameNavigateParams;
-struct LoadCommittedDetails;
-}  // namespace content
-
 namespace android_webview {
 
 class AwRenderViewHostExtClient {
  public:
   // Called when the RenderView page scale changes.
   virtual void OnWebLayoutPageScaleFactorChanged(float page_scale_factor) = 0;
   virtual void OnWebLayoutContentsSizeChanged(
       const gfx::Size& contents_size) = 0;
 
  protected:
@@ skipping 46 matching lines @@
   void SetJsOnlineProperty(bool network_up);
 
   void SmoothScroll(int target_x, int target_y, long duration_ms);
 
  private:
   // content::WebContentsObserver implementation.
   void RenderViewCreated(content::RenderViewHost* view_host) override;
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override;
   void RenderFrameCreated(content::RenderFrameHost* frame_host) override;
-  void DidNavigateAnyFrame(content::RenderFrameHost* render_frame_host,
-                           const content::LoadCommittedDetails& details,
-                           const content::FrameNavigateParams& params) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void OnPageScaleFactorChanged(float page_scale_factor) override;
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
 
   void OnDocumentHasImagesResponse(content::RenderFrameHost* render_frame_host,
                                    int msg_id,
                                    bool has_images);
   void OnUpdateHitTestData(content::RenderFrameHost* render_frame_host,
                            const AwHitTestData& hit_test_data);
   void OnContentsSizeChanged(content::RenderFrameHost* render_frame_host,
@@ skipping 16 matching lines @@
   AwHitTestData last_hit_test_data_;
 
   bool has_new_hit_test_data_;
 
   DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_