Remove navigation from TestRenderViewHost

content/test/test_render_view_host.h

Index: content/test/test_render_view_host.h
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index d9438de9c02af97a125c6c59e5e4ccfad4c21bca..6d5a5790cdc7e093710d15d08b3c4a6850702121 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -211,32 +211,9 @@ class TestRenderViewHost
   // RenderViewHostTester implementation.  Note that CreateRenderView
   // is not specified since it is synonymous with the one from
   // RenderViewHostImpl, see below.
-  virtual void SetContentsMimeType(const std::string& mime_type) override;
   virtual void SimulateWasHidden() override;
   virtual void SimulateWasShown() override;
 
-  // NOTE: These methods are deprecated and the equivalents in
-  // TestRenderFrameHost should be used.
-  virtual void SendNavigate(int page_id, const GURL& url) override;
-  virtual void SendFailedNavigate(int page_id, const GURL& url) override;
-  virtual void SendNavigateWithTransition(
-      int page_id,
-      const GURL& url,
-      ui::PageTransition transition) override;
-
-  // Calls OnNavigate on the RenderViewHost with the given information,
-  // including a custom original request URL.  Sets the rest of the
-  // parameters in the message to the "typical" values.  This is a helper
-  // function for simulating the most common types of loads.
-  void SendNavigateWithOriginalRequestURL(
-      int page_id, const GURL& url, const GURL& original_request_url);
-
-  void SendNavigateWithFile(
-      int page_id, const GURL& url, const base::FilePath& file_path);
-
-  void SendNavigateWithParams(
-      FrameHostMsg_DidCommitProvisionalLoad_Params* params);
-
   void TestOnUpdateStateWithFile(
       int page_id, const base::FilePath& file_path);
 
@@ -254,28 +231,9 @@ class TestRenderViewHost
     render_view_created_ = created;
   }
 
-  // If set, navigations will appear to have loaded through a proxy
-  // (ViewHostMsg_FrameNavigte_Params::was_fetched_via_proxy).
-  // False by default.
-  void set_simulate_fetch_via_proxy(bool proxy);
-
-  // If set, navigations will appear to have cleared the history list in the
-  // RenderView
-  // (FrameHostMsg_DidCommitProvisionalLoad_Params::history_list_was_cleared).
-  // False by default.
-  void set_simulate_history_list_was_cleared(bool cleared);
-
   // The opener route id passed to CreateRenderView().
   int opener_route_id() const { return opener_route_id_; }
 
-  // TODO(creis): Remove the need for these methods.
-  TestRenderFrameHost* main_render_frame_host() const {
-    return main_render_frame_host_;
-  }
-  void set_main_render_frame_host(TestRenderFrameHost* rfh) {
-    main_render_frame_host_ = rfh;
-  }
-
   // RenderViewHost overrides --------------------------------------------------
 
   virtual bool CreateRenderView(const base::string16& frame_name,
@@ -312,20 +270,9 @@ class TestRenderViewHost
   // See set_delete_counter() above. May be NULL.
   int* delete_counter_;
 
-  // See set_simulate_fetch_via_proxy() above.
-  bool simulate_fetch_via_proxy_;
-
-  // See set_simulate_history_list_was_cleared() above.
-  bool simulate_history_list_was_cleared_;
-
-  // See SetContentsMimeType() above.
-  std::string contents_mime_type_;
-
   // See opener_route_id() above.
   int opener_route_id_;
 
-  TestRenderFrameHost* main_render_frame_host_;
-
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewHost);
 };