Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

chrome/browser/extensions/chrome_app_api_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 <string>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 72 matching lines @@
  private:
   content::RenderFrameHost* GetIFrame() {
     return content::FrameMatchingPredicate(
         browser()->tab_strip_model()->GetActiveWebContents(),
         base::Bind(&content::FrameIsChildOfMainFrame));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   GURL app_url =
       embedded_test_server()->GetURL("app.com", "/extensions/test_file.html");
   GURL non_app_url = embedded_test_server()->GetURL(
       "nonapp.com", "/extensions/test_file.html");
 
   // Before the app is installed, app.com does not think that it is installed
   ui_test_utils::NavigateToURL(browser(), app_url);
   EXPECT_FALSE(IsAppInstalledInMainFrame());
 
   // Load an app which includes app.com in its extent.
@@ skipping 58 matching lines @@
           "    }()"
           ");",
           &result));
 
   // Should not be able to alter window.chrome.app.isInstalled from javascript";
   EXPECT_EQ("true", result);
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   GURL app_url = embedded_test_server()->GetURL(
       "app.com", "/extensions/get_app_details_for_frame.html");
   GURL non_app_url = embedded_test_server()->GetURL(
       "nonapp.com", "/extensions/get_app_details_for_frame.html");
 
   // Before the app is installed, app.com does not think that it is installed
   ui_test_utils::NavigateToURL(browser(), app_url);
 
   EXPECT_EQ("not_installed", InstallStateInMainFrame());
   EXPECT_EQ("cannot_run", RunningStateInMainFrame());
@@ skipping 36 matching lines @@
   EXPECT_EQ("cannot_run", RunningStateInMainFrame());
   EXPECT_FALSE(IsAppInstalledInMainFrame());
 
   EXPECT_EQ("installed", InstallStateInIFrame());
   EXPECT_EQ("cannot_run", RunningStateInIFrame());
   EXPECT_FALSE(IsAppInstalledInIFrame());
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningStateFrame) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
   GURL app_url = embedded_test_server()->GetURL(
       "app.com", "/extensions/get_app_details_for_frame_reversed.html");
 
   // Check the install and running state of a non-app iframe running
   // within an app.
   ui_test_utils::NavigateToURL(browser(), app_url);
 
   EXPECT_EQ("not_installed", InstallStateInIFrame());
   EXPECT_EQ("cannot_run", RunningStateInIFrame());
   EXPECT_FALSE(IsAppInstalledInIFrame());
 }