Migrating tests to use EmbeddedTestServer (/content)

content/browser/loader/async_resource_handler_browsertest.cc

 // Copyright 2015 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 "content/browser/loader/async_resource_handler.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/strings/string_util.h"
@@ skipping 47 matching lines @@
     return scoped_ptr<net::test_server::HttpResponse>();
   }
 }
 
 }  // namespace
 
 class AsyncResourceHandlerBrowserTest : public ContentBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest, UploadProgress) {
-  net::test_server::EmbeddedTestServer* test_server = embedded_test_server();
-  ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
+  net::EmbeddedTestServer* test_server = embedded_test_server();
+  ASSERT_TRUE(test_server->Start());
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kPostPath));
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
       base::StringPrintf("WaitForAsyncXHR('%s', %" PRIuS ")",
                          kPostPath,
                          kPayloadSize),
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
 IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest,
                        UploadProgressRedirect) {
-  net::test_server::EmbeddedTestServer* test_server = embedded_test_server();
-  ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
+  net::EmbeddedTestServer* test_server = embedded_test_server();
+  ASSERT_TRUE(test_server->Start());
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kRedirectPostPath));
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
       base::StringPrintf("WaitForAsyncXHR('%s', %" PRIuS ")",
                          kRedirectPostPath,
                          kPayloadSize),
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
 }  // namespace content