Convert RenderViewHostTest to use the new navigation callbacks.

content/browser/renderer_host/render_view_host_browsertest.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 "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
@@ skipping 10 matching lines @@
   RenderViewHostTest() {}
 };
 
 class RenderViewHostTestWebContentsObserver : public WebContentsObserver {
  public:
   explicit RenderViewHostTestWebContentsObserver(WebContents* web_contents)
       : WebContentsObserver(web_contents),
         navigation_count_(0) {}
   ~RenderViewHostTestWebContentsObserver() override {}
 
-  void DidNavigateMainFrame(const LoadCommittedDetails& details,
-                            const FrameNavigateParams& params) override {
-    observed_socket_address_ = params.socket_address;
-    base_url_ = params.base_url;
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override {
+    if (!navigation_handle->IsInMainFrame() ||
+        !navigation_handle->HasCommitted()) {
+      return;
+    }
+
+    NavigationHandleImpl* impl =
+        static_cast<NavigationHandleImpl*>(navigation_handle);
+    observed_socket_address_ = navigation_handle->GetSocketAddress();
+    base_url_ = impl->base_url();
     ++navigation_count_;
   }
 
   const net::HostPortPair& observed_socket_address() const {
     return observed_socket_address_;
   }
 
   GURL base_url() const {
     return base_url_;
   }
@@ skipping 103 matching lines @@
 
   // Do something that causes ipc queues to flush and tasks in
   // flight to complete such that we should have received the ACK.
   NavigateToURL(shell(), test_url);
 
   // Verify we have the only remaining reference to the namespace.
   EXPECT_TRUE(session_namespace->HasOneRef());
 }
 
 }  // namespace content