Revert 161572 - WebSocket test server migration on ExtensionApiTest.WebSocket (third trial)

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/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #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 {
 
 const char kTestServerPort[] = "testServer.port";
 const char kTestDataDirectory[] = "testDataDirectory";
 const char kTestWebSocketPort[] = "testWebSocketPort";
 
 };  // namespace
 
 ExtensionApiTest::ExtensionApiTest() {}
@@ skipping 253 matching lines @@
   // 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,
                            test_server()->host_port_pair().port());
 
   return true;
 }
 
 bool ExtensionApiTest::StartWebSocketServer(const FilePath& root_directory) {
-  websocket_server_.reset(new net::TestServer(
-      net::TestServer::TYPE_WS,
-      net::TestServer::kLocalhost,
-      root_directory));
-
-  if (!websocket_server_->Start())
+  websocket_server_.reset(new content::TestWebSocketServer());
+  int port = websocket_server_->UseRandomPort();
+  if (!websocket_server_->Start(root_directory))
     return false;
 
-  test_config_->SetInteger(kTestWebSocketPort,
-                           websocket_server_->host_port_pair().port());
-
+  test_config_->SetInteger(kTestWebSocketPort, port);
   return true;
 }
 
 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   test_data_dir_ = test_data_dir_.AppendASCII("api_test");
 }
 
 PlatformAppApiTest::PlatformAppApiTest() {}
 
 PlatformAppApiTest::~PlatformAppApiTest() {}
 
 void PlatformAppApiTest::SetUpCommandLine(CommandLine* command_line) {
   ExtensionApiTest::SetUpCommandLine(command_line);
 
   // If someone is using this class, we're going to insist on management of the
   // relevant flags. If these flags are already set, die.
   DCHECK(!command_line->HasSwitch(switches::kEnableExperimentalExtensionApis));
 
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }