Remove navigation from TestRenderViewHost

content/public/test/test_renderer_host.cc

 // 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.
 
 #include "content/public/test/test_renderer_host.h"
 
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 20 matching lines @@
 
 namespace content {
 
 // RenderFrameHostTester ------------------------------------------------------
 
 // static
 RenderFrameHostTester* RenderFrameHostTester::For(RenderFrameHost* host) {
   return static_cast<TestRenderFrameHost*>(host);
 }
 
+// static
+RenderFrameHost* RenderFrameHostTester::GetPendingForController(
+    NavigationController* controller) {
+  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
+      controller->GetWebContents());
+  return web_contents->GetRenderManagerForTesting()->pending_frame_host();
+}
+
 // RenderViewHostTester -------------------------------------------------------
 
 // static
 RenderViewHostTester* RenderViewHostTester::For(RenderViewHost* host) {
   return static_cast<TestRenderViewHost*>(host);
 }
 
 // static
-RenderViewHost* RenderViewHostTester::GetPendingForController(
-    NavigationController* controller) {
-  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      controller->GetWebContents());
-  return web_contents->GetRenderManagerForTesting()->pending_render_view_host();
-}
-
-// static
 bool RenderViewHostTester::IsRenderViewHostSwappedOut(RenderViewHost* rvh) {
   return static_cast<RenderFrameHostImpl*>(rvh->GetMainFrame())->rfh_state() ==
          RenderFrameHostImpl::STATE_SWAPPED_OUT;
 }
 
 // static
 bool RenderViewHostTester::TestOnMessageReceived(RenderViewHost* rvh,
                                                  const IPC::Message& msg) {
   return static_cast<RenderViewHostImpl*>(rvh)->OnMessageReceived(msg);
 }
@@ skipping 86 matching lines @@
 }
 
 void RenderViewHostTestHarness::NavigateAndCommit(const GURL& url) {
   static_cast<TestWebContents*>(web_contents())->NavigateAndCommit(url);
 }
 
 void RenderViewHostTestHarness::Reload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   DCHECK(entry);
   controller().Reload(false);
-  static_cast<TestRenderViewHost*>(
-      rvh())->SendNavigateWithTransition(
-          entry->GetPageID(), entry->GetURL(), ui::PAGE_TRANSITION_RELOAD);
+  RenderFrameHostTester::For(main_rfh())->SendNavigateWithTransition(
+      entry->GetPageID(), entry->GetURL(), ui::PAGE_TRANSITION_RELOAD);
 }
 
 void RenderViewHostTestHarness::FailedReload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   DCHECK(entry);
   controller().Reload(false);
-  static_cast<TestRenderViewHost*>(
-      rvh())->SendFailedNavigate(entry->GetPageID(), entry->GetURL());
+  RenderFrameHostTester::For(main_rfh())->SendFailedNavigate(entry->GetPageID(),
+                                                             entry->GetURL());
 }
 
 void RenderViewHostTestHarness::SetUp() {
   thread_bundle_.reset(new TestBrowserThreadBundle(thread_bundle_options_));
 
 #if defined(OS_WIN)
   ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
 #if defined(USE_AURA)
   // The ContextFactory must exist before any Compositors are created.
@@ skipping 44 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content