WebSocket test server migration on ExtensionApiTest.WebSocket

chrome/browser/extensions/extension_apitest.h

Index: chrome/browser/extensions/extension_apitest.h
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index a92345597ad854058fefc2c10d951bc743f3af47..91f91a5efd500a6a0f08ff8388e3cc707c179fe5 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -15,10 +15,6 @@
 
 class FilePath;
 
-namespace content {
-class TestWebSocketServer;
-}
-
 namespace extensions {
 class Extension;
 }
@@ -159,8 +155,8 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   // will be available to javascript tests using chrome.test.getConfig().
   bool StartTestServer();
 
-  // Start the test WebSocket server, and store details of its state. Those
-  // details will be available to javascript tests using
+  // Start the other test server in WebSocket mode, and store details of its
+  // state. Those details will be available to javascript tests using
   // chrome.test.getConfig().

[Ryan Sleevi, 2012/10/09 19:39:07]

nit: I think the original comment is cleaner, as it describes what this method
does by itself (eg: independent of StartTestServer), which I think is the right
approach.

[Takashi Toyoshima, 2012/10/10 01:34:48]

OK, I revert this.

   bool StartWebSocketServer(const FilePath& root_directory);
 
@@ -184,7 +180,7 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   scoped_ptr<DictionaryValue> test_config_;
 
   // Hold the test WebSocket server.
-  scoped_ptr<content::TestWebSocketServer> websocket_server_;
+  scoped_ptr<net::TestServer> websocket_server_;
 };
 
 // PlatformAppApiTest sets up the command-line flags necessary for platform