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(

[Charlie Reis, 2014/10/08 17:41:55]

Are these going away in a future CL?

[ncarter (slow), 2014/10/08 22:39:28]

Whoops! I meant to rip these out too!

The new patch set eliminates seven more methods and a couple of data members.

       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);
@@ skipping 69 matching lines @@
 
   // 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)
@@ skipping 41 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_