Remove navigation from TestRenderViewHost

content/public/test/test_renderer_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_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 30 matching lines @@
 
 // An interface and utility for driving tests of RenderFrameHost.
 class RenderFrameHostTester {
  public:
   // Retrieves the RenderFrameHostTester that drives the specified
   // RenderFrameHost. The RenderFrameHost must have been created while
   // RenderFrameHost testing was enabled; use a
   // RenderViewHostTestEnabler instance (see below) to do this.
   static RenderFrameHostTester* For(RenderFrameHost* host);
 
+  // If the given NavigationController has a pending main frame, returns it,
+  // otherwise NULL. This is an alternative to
+  // WebContentsTester::GetPendingMainFrame() when your WebContents was not
+  // created via a TestWebContents.
+  static RenderFrameHost* GetPendingForController(
+      NavigationController* controller);
+
   virtual ~RenderFrameHostTester() {}
 
   // Gives tests access to RenderFrameHostImpl::OnCreateChild. The returned
   // RenderFrameHost is owned by the parent RenderFrameHost.
   virtual RenderFrameHost* AppendChild(const std::string& frame_name) = 0;
 
   // Calls OnDidCommitProvisionalLoad on the RenderFrameHost with the given
+  // information. 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.
+  virtual void SendNavigate(int page_id, const GURL& url) = 0;
+  virtual void SendFailedNavigate(int page_id, const GURL& url) = 0;
+
+  // Calls OnDidCommitProvisionalLoad on the RenderFrameHost with the given
   // information, including a custom PageTransition.  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.
   virtual void SendNavigateWithTransition(int page_id,
                                           const GURL& url,
                                           ui::PageTransition transition) = 0;
 
+  // If set, future loads will have |mime_type| set as the mime type.
+  // If not set, the mime type will default to "text/html".
+  virtual void SetContentsMimeType(const std::string& mime_type) = 0;
+
   // Calls OnBeforeUnloadACK on this RenderFrameHost with the given parameter.
   virtual void SendBeforeUnloadACK(bool proceed) = 0;
 
   // Simulates the SwapOut_ACK that fires if you commit a cross-site
   // navigation without making any network requests.
   virtual void SimulateSwapOutACK() = 0;
 };
 
 // An interface and utility for driving tests of RenderViewHost.
 class RenderViewHostTester {
  public:
   // Retrieves the RenderViewHostTester that drives the specified
   // RenderViewHost.  The RenderViewHost must have been created while
   // RenderViewHost testing was enabled; use a
   // RenderViewHostTestEnabler instance (see below) to do this.
   static RenderViewHostTester* For(RenderViewHost* host);
 
-  // If the given WebContentsImpl has a pending RVH, returns it, otherwise NULL.
-  static RenderViewHost* GetPendingForController(
-      NavigationController* controller);
-
   // This removes the need to expose
   // RenderViewHostImpl::is_swapped_out() outside of content.
   //
   // This is safe to call on any RenderViewHost, not just ones
   // constructed while a RenderViewHostTestEnabler is in play.
   static bool IsRenderViewHostSwappedOut(RenderViewHost* rvh);
 
   // Calls the RenderViewHosts' private OnMessageReceived function with the
   // given message.
   static bool TestOnMessageReceived(RenderViewHost* rvh,
                                     const IPC::Message& msg);
 
   // Returns whether the underlying web-page has any touch-event handlers.
   static bool HasTouchEventHandler(RenderViewHost* rvh);
 
   virtual ~RenderViewHostTester() {}
 
   // Gives tests access to RenderViewHostImpl::CreateRenderView.
   virtual bool CreateRenderView(const base::string16& frame_name,
                                 int opener_route_id,
                                 int proxy_routing_id,
                                 int32 max_page_id,
                                 bool created_with_opener) = 0;
 
-  // Calls OnMsgNavigate on the RenderViewHost with the given information,
-  // setting 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.
-  virtual void SendNavigate(int page_id, const GURL& url) = 0;
-  virtual void SendFailedNavigate(int page_id, const GURL& url) = 0;
-
-  // Calls OnMsgNavigate on the RenderViewHost with the given information,
-  // including a custom PageTransition.  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.
-  virtual void SendNavigateWithTransition(int page_id, const GURL& url,
-                                          ui::PageTransition transition) = 0;
-
-  // If set, future loads will have |mime_type| set as the mime type.
-  // If not set, the mime type will default to "text/html".
-  virtual void SetContentsMimeType(const std::string& mime_type) = 0;
-
   // Makes the WasHidden/WasShown calls to the RenderWidget that
   // tell it it has been hidden or restored from having been hidden.
   virtual void SimulateWasHidden() = 0;
   virtual void SimulateWasShown() = 0;
 };
 
 // You can instantiate only one class like this at a time.  During its
 // lifetime, RenderViewHost and RenderFrameHost objects created may be used via
 // RenderViewHostTester and RenderFrameHostTester respectively.
 class RenderViewHostTestEnabler {
@@ skipping 105 matching lines @@
 
   int thread_bundle_options_;
   scoped_ptr<TestBrowserThreadBundle> thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_