Remove navigation from TestRenderViewHost

content/test/test_render_view_host.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 CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 193 matching lines @@
                      RenderViewHostDelegate* delegate,
                      RenderWidgetHostDelegate* widget_delegate,
                      int routing_id,
                      int main_frame_routing_id,
                      bool swapped_out);
   virtual ~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);
 
   void TestOnStartDragging(const DropData& drop_data);
 
   // If set, *delete_counter is incremented when this object destructs.
   void set_delete_counter(int* delete_counter) {
     delete_counter_ = delete_counter;
   }
 
   // Sets whether the RenderView currently exists or not. This controls the
   // return value from IsRenderViewLive, which the rest of the system uses to
   // check whether the RenderView has crashed or not.
   void set_render_view_created(bool created) {
     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,
                                 int opener_route_id,
                                 int proxy_route_id,
                                 int32 max_page_id,
                                 bool window_was_created_with_opener) override;
   virtual bool IsRenderViewLive() const override;
   virtual bool IsFullscreen() const override;
 
@@ skipping 16 matching lines @@
       int response_code,
       const base::FilePath* file_path_for_history_item);
 
   // Tracks if the caller thinks if it created the RenderView. This is so we can
   // respond to IsRenderViewLive appropriately.
   bool render_view_created_;
 
   // 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);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 // Adds methods to get straight at the impl classes.
 class RenderViewHostImplTestHarness : public RenderViewHostTestHarness {
  public:
@@ skipping 36 matching lines @@
  private:
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_