Migrating tests to use EmbeddedTestServer (/content)

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/command_line.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/child_process_messages.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"
@@ skipping 44 matching lines @@
   int host_destructions_;
 };
 
 // Sometimes the renderer process's ShutdownRequest (corresponding to the
 // ViewMsg_WasSwappedOut from a previous navigation) doesn't arrive until after
 // 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()->InitializeAndWaitUntilReady());
+  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();
 
   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()->InitializeAndWaitUntilReady());
+  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();
   // Make it believe it's a guest.
   reinterpret_cast<RenderProcessHostImpl*>(rph)->
       set_is_for_guests_only_for_testing(true);
   EXPECT_EQ(1, RenderProcessHostCount());
 
@@ skipping 49 matching lines @@
     logging_string_->append("ObserverLogger::RenderProcessHostDestroyed ");
     host_destroyed_ = true;
   }
 
   std::string* logging_string_;
   bool host_destroyed_;
 };
 
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest,
                        AllProcessExitedCallsBeforeAnyHostDestroyedCalls) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  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();
 
@@ skipping 18 matching lines @@
   // If the test fails, and somehow the RPH is still alive somehow, at least
   // deregister the observers so that the test fails and doesn't also crash.
   if (!observer_logger.host_destroyed()) {
     rph->RemoveObserver(&shell_closer);
     rph->RemoveObserver(&observer_logger);
   }
 }
 
 }  // namespace
 }  // namespace content