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

chrome/browser/extensions/extension_apitest.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 "chrome/browser/extensions/extension_apitest.h"
 
 #include "base/base_switches.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 20 matching lines @@
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 namespace {
 
 const char kTestCustomArg[] = "customArg";
 const char kTestServerPort[] = "testServer.port";
 const char kTestDataDirectory[] = "testDataDirectory";
 const char kTestWebSocketPort[] = "testWebSocketPort";
 const char kSitePerProcess[] = "sitePerProcess";
 const char kFtpServerPort[] = "ftpServer.port";
-const char kSpawnedTestServerPort[] = "spawnedTestServer.port";
+const char kEmbeddedTestServerPort[] = "embeddedTestServer.port";
 
 scoped_ptr<net::test_server::HttpResponse> HandleServerRedirectRequest(
     const net::test_server::HttpRequest& request) {
   if (!base::StartsWith(request.relative_url, "/server-redirect?",
                         base::CompareCase::SENSITIVE))
     return nullptr;
 
   size_t query_string_pos = request.relative_url.find('?');
   std::string redirect_target =
       request.relative_url.substr(query_string_pos + 1);
@@ skipping 311 matching lines @@
   }
 
   if (!result) {
     message_ = "extension pointer is NULL.";
     return NULL;
   }
   return result;
 }
 
 bool ExtensionApiTest::StartEmbeddedTestServer() {
-  if (!embedded_test_server()->InitializeAndWaitUntilReady())
+  if (!embedded_test_server()->Start())
     return false;
 
   // Build a dictionary of values that tests can use to build URLs that
   // access the test server and local file system.  Tests can see these values
   // using the extension API function chrome.test.getConfig().
   test_config_->SetInteger(kTestServerPort,
                            embedded_test_server()->port());
 
   return true;
 }
@@ skipping 22 matching lines @@
 
   if (!ftp_server_->Start())
     return false;
 
   test_config_->SetInteger(kFtpServerPort,
                            ftp_server_->host_port_pair().port());
 
   return true;
 }
 
-bool ExtensionApiTest::StartSpawnedTestServer() {
-  if (!test_server()->Start())
+bool ExtensionApiTest::StartTestServer() {

[mmenke, 2015/11/17 21:54:12]

This is now identical to StartEmbeddedTestServer, except the other one uses
kTestServerPort.  Just remove one or the other and update callers?  Also make
sure the kBlahServerPort matches the BlahServer() method.

[svaldez, 2015/11/17 22:18:53]

Done.

+  if (!embedded_test_server()->Start())
     return false;
 
   // Build a dictionary of values that tests can use to build URLs that
   // access the test server and local file system.  Tests can see these values
   // using the extension API function chrome.test.getConfig().
-  test_config_->SetInteger(kSpawnedTestServerPort,
-                           test_server()->host_port_pair().port());
+  test_config_->SetInteger(kEmbeddedTestServerPort,
+                           embedded_test_server()->host_port_pair().port());
 
   return true;
 }
 
 void ExtensionApiTest::SetUpCommandLine(base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   test_data_dir_ = test_data_dir_.AppendASCII("api_test");
   // Backgrounded renderer processes run at a lower priority, causing the
   // tests to take more time to complete. Disable backgrounding so that the
   // tests don't time out.
   command_line->AppendSwitch(switches::kDisableRendererBackgrounding);
 }