Convert RenderViewHostTest to use the new navigation callbacks.

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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 CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include <stddef.h>
@@ skipping 93 matching lines @@
   bool IsPost() override;
   const Referrer& GetReferrer() override;
   bool HasUserGesture() override;
   ui::PageTransition GetPageTransition() override;
   bool IsExternalProtocol() override;
   net::Error GetNetErrorCode() override;
   RenderFrameHostImpl* GetRenderFrameHost() override;
   bool IsSamePage() override;
   bool HasCommitted() override;
   bool IsErrorPage() override;
+  net::HostPortPair GetSocketAddress() override;
   const net::HttpResponseHeaders* GetResponseHeaders() override;
   net::HttpResponseInfo::ConnectionInfo GetConnectionInfo() override;
   void Resume() override;
   void CancelDeferredNavigation(
       NavigationThrottle::ThrottleCheckResult result) override;
   void RegisterThrottleForTesting(
       std::unique_ptr<NavigationThrottle> navigation_throttle) override;
   NavigationThrottle::ThrottleCheckResult CallWillStartRequestForTesting(
       bool is_post,
       const Referrer& sanitized_referrer,
@@ skipping 166 matching lines @@
 
   SSLStatus ssl_status() { return ssl_status_; }
 
   // Called when the navigation is transferred to a different renderer.
   void Transfer();
 
   NavigationUIData* navigation_ui_data() const {
     return navigation_ui_data_.get();
   }
 
+  const GURL& base_url() { return base_url_; }
+
   void set_searchable_form_url(const GURL& url) { searchable_form_url_ = url; }
   void set_searchable_form_encoding(const std::string& encoding) {
     searchable_form_encoding_ = encoding;
   }
 
  private:
   friend class NavigationHandleImplTest;
 
   // Used to track the state the navigation is currently in.
   enum State {
@@ skipping 141 matching lines @@
 
   // False by default unless the navigation started within a context menu.
   bool started_from_context_menu_;
 
   // Stores the reload type, or NONE if it's not a reload.
   ReloadType reload_type_;
 
   GURL searchable_form_url_;
   std::string searchable_form_encoding_;
 
+  GURL base_url_;
+  net::HostPortPair socket_address_;
+
   base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_