Remove navigation from TestRenderViewHost

content/public/test/test_renderer_host.h

Index: content/public/test/test_renderer_host.h
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index c697656cf533cfc8a8a7f71d24fa3f4f2589263b..176b27d7ecfc5e26cba6d97e18dbb84c56ef8654 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -48,6 +48,13 @@ class RenderFrameHostTester {
   // 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
@@ -55,6 +62,13 @@ class RenderFrameHostTester {
   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.
@@ -62,6 +76,10 @@ class RenderFrameHostTester {
                                           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;
 
@@ -79,10 +97,6 @@ class RenderViewHostTester {
   // 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.
   //
@@ -107,23 +121,6 @@ class RenderViewHostTester {
                                 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;