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

chrome/browser/extensions/extension_loading_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.
 //
 // This file contains tests for extension loading, reloading, and
 // unloading behavior.
 
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/version.h"
@@ skipping 15 matching lines @@
 namespace {
 
 class ExtensionLoadingTest : public ExtensionBrowserTest {
 };
 
 // Check the fix for http://crbug.com/178542.
 IN_PROC_BROWSER_TEST_F(ExtensionLoadingTest,
                        UpgradeAfterNavigatingFromOverriddenNewTabPage) {
   embedded_test_server()->ServeFilesFromDirectory(
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   TestExtensionDir extension_dir;
   const char manifest_template[] =
       "{"
       "  'name': 'Overrides New Tab',"
       "  'version': '%d',"
       "  'description': 'Overrides New Tab',"
       "  'manifest_version': 2,"
       "  'background': {"
       "    'persistent': false,"
@@ skipping 45 matching lines @@
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
   EXPECT_EQ(0U, registry->terminated_extensions().size());
   EXPECT_TRUE(registry->enabled_extensions().Contains(new_tab_extension->id()));
 }
 
 // Tests the behavior described in http://crbug.com/532088.
 IN_PROC_BROWSER_TEST_F(ExtensionLoadingTest,
                        KeepAliveWithDevToolsOpenOnReload) {
   embedded_test_server()->ServeFilesFromDirectory(
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   TestExtensionDir extension_dir;
   const char manifest_contents[] =
       "{"
       "  'name': 'Test With Lazy Background Page',"
       "  'version': '0',"
       "  'manifest_version': 2,"
       "  'app': {"
       "    'background': {"
       "       'scripts': ['event.js']"
@@ skipping 36 matching lines @@
   // The old Extension object is no longer valid.
   extension = ExtensionRegistry::Get(profile())
       ->enabled_extensions().GetByID(extension_id);
 
   // Keepalive count should stabilize back to 1, because DevTools is still open.
   EXPECT_EQ(1, process_manager->GetLazyKeepaliveCount(extension));
 }
 
 }  // namespace
 }  // namespace extensions