WebSocket test server migration on ExtensionApiTest.WebSocket

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 c149d2bced960d77c6534108f5978aab90fdfdf0..1a2b50dd595294fb8875e4bf9e7ece40d7ff3d71 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -18,8 +18,8 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
+#include "net/test/test_server.h"
 
 namespace {
 
@@ -103,6 +103,7 @@ void ExtensionApiTest::SetUpInProcessBrowserTestFixture() {
   test_config_.reset(new DictionaryValue());
   test_config_->SetString(kTestDataDirectory,
                           net::FilePathToFileURL(test_data_dir_).spec());
+  test_config_->SetInteger(kTestWebSocketPort, 0);
   extensions::TestGetConfigFunction::set_test_config_state(
       test_config_.get());
 }
@@ -293,12 +294,17 @@ bool ExtensionApiTest::StartTestServer() {
 }
 
 bool ExtensionApiTest::StartWebSocketServer(const FilePath& root_directory) {
-  websocket_server_.reset(new content::TestWebSocketServer());
-  int port = websocket_server_->UseRandomPort();
-  if (!websocket_server_->Start(root_directory))
+  websocket_server_.reset(new net::TestServer(
+      net::TestServer::TYPE_WS,
+      net::TestServer::kLocalhost,
+      root_directory));
+
+  if (!websocket_server_->Start())
     return false;
 
-  test_config_->SetInteger(kTestWebSocketPort, port);
+  test_config_->SetInteger(kTestWebSocketPort,
+                           websocket_server_->host_port_pair().port());
+
   return true;
 }