Convert AwRenderViewHostExt to use the new navigation callbacks.

android_webview/browser/renderer_host/aw_render_view_host_ext.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 "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/render_view_messages.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "components/web_restrictions/browser/web_restrictions_mojo_implementation.h"
 #include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/frame_navigate_params.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 
 namespace android_webview {
 
 AwRenderViewHostExt::AwRenderViewHostExt(
     AwRenderViewHostExtClient* client, content::WebContents* contents)
     : content::WebContentsObserver(contents),
       client_(client),
       background_color_(SK_ColorWHITE),
       has_new_hit_test_data_(false) {
@@ skipping 113 matching lines @@
   image_requests_callback_map_.clear();
 }
 
 void AwRenderViewHostExt::RenderFrameCreated(
     content::RenderFrameHost* frame_host) {
   frame_host->GetInterfaceRegistry()->AddInterface(
       base::Bind(&web_restrictions::WebRestrictionsMojoImplementation::Create,
                  AwBrowserContext::GetDefault()->GetWebRestrictionProvider()));
 }
 
-void AwRenderViewHostExt::DidNavigateAnyFrame(
-    content::RenderFrameHost* render_frame_host,
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
+void AwRenderViewHostExt::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
   DCHECK(CalledOnValidThread());
 
   AwBrowserContext::FromWebContents(web_contents())
-      ->AddVisitedURLs(params.redirects);
+      ->AddVisitedURLs(navigation_handle->GetRedirectChain());
 }
 
 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
   client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor);
 }
 
 bool AwRenderViewHostExt::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   bool handled = true;
@@ skipping 54 matching lines @@
     content::RenderFrameHost* render_frame_host,
     const gfx::Size& contents_size) {
   // Only makes sense coming from the main frame of the current frame tree.
   if (render_frame_host != web_contents()->GetMainFrame())
     return;
 
   client_->OnWebLayoutContentsSizeChanged(contents_size);
 }
 
 }  // namespace android_webview