Migrating tests to use EmbeddedTestServer (/content)

content/browser/renderer_host/render_view_host_browsertest.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 "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 44 matching lines @@
 
  private:
   net::HostPortPair observed_socket_address_;
   GURL base_url_;
   int navigation_count_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestWebContentsObserver);
 };
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   RenderViewHostTestWebContentsObserver observer(shell()->web_contents());
 
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
 
   EXPECT_EQ(net::HostPortPair::FromURL(
                 embedded_test_server()->base_url()).ToString(),
             observer.observed_socket_address().ToString());
   EXPECT_EQ(1, observer.navigation_count());
 }
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   RenderViewHostTestWebContentsObserver observer(shell()->web_contents());
 
   // Base URL is not set if it is the same as the URL.
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
   EXPECT_TRUE(observer.base_url().is_empty());
   EXPECT_EQ(1, observer.navigation_count());
 
   // But should be set to the original page when reading MHTML.
   base::FilePath content_test_data_dir;
   ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &content_test_data_dir));
   test_url = net::FilePathToFileURL(
       content_test_data_dir.AppendASCII("google.mht"));
   NavigateToURL(shell(), test_url);
   EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
 }
 
 // This test ensures a RenderFrameHost object is created for the top level frame
 // in each RenderViewHost.
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BasicRenderFrameHost) {
-  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);
 
   FrameTreeNode* old_root = static_cast<WebContentsImpl*>(
       shell()->web_contents())->GetFrameTree()->root();
   EXPECT_TRUE(old_root->current_frame_host());
 
   ShellAddedObserver new_shell_observer;
   EXPECT_TRUE(ExecuteScript(shell()->web_contents(), "window.open();"));
   Shell* new_shell = new_shell_observer.GetShell();
   FrameTreeNode* new_root = static_cast<WebContentsImpl*>(
       new_shell->web_contents())->GetFrameTree()->root();
 
   EXPECT_TRUE(new_root->current_frame_host());
   EXPECT_NE(old_root->current_frame_host()->routing_id(),
             new_root->current_frame_host()->routing_id());
 }
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, IsFocusedElementEditable) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL test_url = embedded_test_server()->GetURL("/touch_selection.html");
   NavigateToURL(shell(), test_url);
 
   RenderViewHost* rvh = shell()->web_contents()->GetRenderViewHost();
   EXPECT_FALSE(rvh->IsFocusedElementEditable());
   EXPECT_TRUE(ExecuteScript(shell()->web_contents(), "focus_textfield();"));
   EXPECT_TRUE(rvh->IsFocusedElementEditable());
 }
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, ReleaseSessionOnCloseACK) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   GURL test_url = embedded_test_server()->GetURL(
       "/access-session-storage.html");
   NavigateToURL(shell(), test_url);
 
   // Make a new Shell, a seperate tab with it's own session namespace and
   // have it start loading a url but still be in progress.
   ShellAddedObserver new_shell_observer;
   EXPECT_TRUE(ExecuteScript(shell()->web_contents(), "window.open();"));
   Shell* new_shell = new_shell_observer.GetShell();
   new_shell->LoadURL(test_url);
@@ skipping 11 matching lines @@
 
   // Do something that causes ipc queues to flush and tasks in
   // flight to complete such that we should have received the ACK.
   NavigateToURL(shell(), test_url);
 
   // Verify we have the only remaining reference to the namespace.
   EXPECT_TRUE(session_namespace->HasOneRef());
 }
 
 }  // namespace content