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

chrome/browser/extensions/extension_apitest.cc

Index: chrome/browser/extensions/extension_apitest.cc
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 261ee75355bd0f3a42470791faf6aacf7d9eb847..cb6ed05398672e7417935c7e251a583369089fcd 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -38,7 +38,7 @@ 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) {
@@ -370,7 +370,7 @@ const extensions::Extension* ExtensionApiTest::GetSingleLoadedExtension() {
 }
 
 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
@@ -413,15 +413,15 @@ bool ExtensionApiTest::StartFTPServer(const base::FilePath& root_directory) {
   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;
 }