Remove some WebContents::GetRenderViewHost() calls.

content/browser/renderer_host/render_process_host_browsertest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/child_process_messages.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_service.mojom.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
@@ skipping 49 matching lines @@
 // the browser process decides to re-use the renderer for a new purpose.  This
 // test makes sure the browser doesn't let the renderer die in that case.  See
 // http://crbug.com/87176.
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest,
                        ShutdownRequestFromActiveTabIgnored) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
   RenderProcessHost* rph =
-      shell()->web_contents()->GetRenderViewHost()->GetProcess();
+      shell()->web_contents()->GetMainFrame()->GetProcess();
 
   host_destructions_ = 0;
   process_exits_ = 0;
   rph->AddObserver(this);
   ChildProcessHostMsg_ShutdownRequest msg;
   rph->OnMessageReceived(msg);
 
   // If the RPH sends a mistaken ChildProcessMsg_Shutdown, the renderer process
   // will take some time to die. Wait for a second tab to load in order to give
   // that time to happen.
   NavigateToURL(CreateBrowser(), test_url);
 
   EXPECT_EQ(0, process_exits_);
   if (!host_destructions_)
     rph->RemoveObserver(this);
 }
 
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest,
                        GuestsAreNotSuitableHosts) {
   // Set max renderers to 1 to force running out of processes.
   content::RenderProcessHost::SetMaxRendererProcessCount(1);
 
   ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
   RenderProcessHost* rph =
-      shell()->web_contents()->GetRenderViewHost()->GetProcess();
+      shell()->web_contents()->GetMainFrame()->GetProcess();
   // Make it believe it's a guest.
   reinterpret_cast<RenderProcessHostImpl*>(rph)->
       set_is_for_guests_only_for_testing(true);
   EXPECT_EQ(1, RenderProcessHostCount());
 
   // Navigate to a different page.
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   GURL another_url = embedded_test_server()->GetURL("/simple_page.html");
   another_url = another_url.ReplaceComponents(replace_host);
@@ skipping 53 matching lines @@
                        AllProcessExitedCallsBeforeAnyHostDestroyedCalls) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
 
   std::string logging_string;
   ShellCloser shell_closer(shell(), &logging_string);
   ObserverLogger observer_logger(&logging_string);
   RenderProcessHost* rph =
-      shell()->web_contents()->GetRenderViewHost()->GetProcess();
+      shell()->web_contents()->GetMainFrame()->GetProcess();
 
   // Ensure that the ShellCloser observer is first, so that it will have first
   // dibs on the ProcessExited callback.
   rph->AddObserver(&shell_closer);
   rph->AddObserver(&observer_logger);
 
   // This will crash the render process, and start all the callbacks.
   // We can't use NavigateToURL here since it accesses the shell() after
   // navigating, which the shell_closer deletes.
   NavigateToURLBlockUntilNavigationsComplete(
@@ skipping 13 matching lines @@
     rph->RemoveObserver(&observer_logger);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, KillProcessOnBadMojoMessage) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
   RenderProcessHost* rph =
-      shell()->web_contents()->GetRenderViewHost()->GetProcess();
+      shell()->web_contents()->GetMainFrame()->GetProcess();
 
   host_destructions_ = 0;
   process_exits_ = 0;
   rph->AddObserver(this);
 
   mojom::TestServicePtr service;
   rph->GetRemoteInterfaces()->GetInterface(&service);
 
   base::RunLoop run_loop;
   set_process_exit_callback(run_loop.QuitClosure());
 
   // Should reply with a bad message and cause process death.
   service->DoSomething(base::Bind(&base::DoNothing));
 
   run_loop.Run();
 
   EXPECT_EQ(1, process_exits_);
   EXPECT_EQ(0, host_destructions_);
   if (!host_destructions_)
     rph->RemoveObserver(this);
 }
 
 }  // namespace
 }  // namespace content