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

chrome/browser/chrome_service_worker_browsertest.cc

 // Copyright 2014 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 tests that Service Workers (a Content feature) work in the Chromium
 // embedder.
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 38 matching lines @@
 }
 
 // http://crbug.com/368570
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerTest,
                        CanShutDownWithRegisteredServiceWorker) {
   WriteFile(FILE_PATH_LITERAL("service_worker.js"), "");
   WriteFile(FILE_PATH_LITERAL("service_worker.js.mock-http-headers"),
             "HTTP/1.1 200 OK\nContent-Type: text/javascript");
 
   embedded_test_server()->ServeFilesFromDirectory(service_worker_dir_.path());
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   content::ServiceWorkerContext* sw_context =
       content::BrowserContext::GetDefaultStoragePartition(browser()->profile())
           ->GetServiceWorkerContext();
 
   base::RunLoop run_loop;
   sw_context->RegisterServiceWorker(
       embedded_test_server()->GetURL("/"),
       embedded_test_server()->GetURL("/service_worker.js"),
       base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
   run_loop.Run();
 
   // Leave the Service Worker registered, and make sure that the browser can
   // shut down without DCHECK'ing. It'd be nice to check here that the SW is
   // actually occupying a process, but we don't yet have the public interface to
   // do that.
 }
 
 // http://crbug.com/419290
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerTest,
                        CanCloseIncognitoWindowWithServiceWorkerController) {
   WriteFile(FILE_PATH_LITERAL("service_worker.js"), "");
   WriteFile(FILE_PATH_LITERAL("service_worker.js.mock-http-headers"),
             "HTTP/1.1 200 OK\nContent-Type: text/javascript");
   WriteFile(FILE_PATH_LITERAL("test.html"), "");
 
   embedded_test_server()->ServeFilesFromDirectory(service_worker_dir_.path());
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   Browser* incognito = CreateIncognitoBrowser();
   content::ServiceWorkerContext* sw_context =
       content::BrowserContext::GetDefaultStoragePartition(incognito->profile())
           ->GetServiceWorkerContext();
 
   base::RunLoop run_loop;
   sw_context->RegisterServiceWorker(
       embedded_test_server()->GetURL("/"),
       embedded_test_server()->GetURL("/service_worker.js"),
       base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
   run_loop.Run();
 
   ui_test_utils::NavigateToURL(incognito,
                                embedded_test_server()->GetURL("/test.html"));
 
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_BROWSER_CLOSED, content::Source<Browser>(incognito));
   incognito->window()->Close();
   observer.Wait();
 
   // Test passes if we don't crash.
 }
 
 }  // namespace