WebSocket test server migration on ExtensionApiTest.WebSocket

chrome/browser/extensions/extension_apitest.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_
 
 #include <deque>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "content/public/browser/notification_registrar.h"
 
 class FilePath;
 
-namespace content {
-class TestWebSocketServer;
-}
-
 namespace extensions {
 class Extension;
 }
 
 
 // The general flow of these API tests should work like this:
 // (1) Setup initial browser state (e.g. create some bookmarks for the
 //     bookmark test)
 // (2) Call ASSERT_TRUE(RunExtensionTest(name));
 // (3) In your extension code, run your test and call chrome.test.pass or
@@ skipping 120 matching lines @@
   bool RunPageTest(const std::string& page_url, int flags);
 
   // Similar to RunExtensionTest, except used for running tests in platform app
   // shell windows.
   bool RunPlatformAppTest(const char* extension_name);
 
   // Start the test server, and store details of its state.  Those details
   // 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);
 
   // Test that exactly one extension loaded.  If so, return a pointer to
   // the extension.  If not, return NULL and set message_.
   const extensions::Extension* GetSingleLoadedExtension();
 
   // All extensions tested by ExtensionApiTest are in the "api_test" dir.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   // If it failed, what was the error message?
   std::string message_;
 
  private:
   bool RunExtensionTestImpl(const char* extension_name,
                             const std::string& test_page,
                             int flags);
 
   // Hold details of the test, set in C++, which can be accessed by
   // javascript using chrome.test.getConfig().
   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
 // apps (if any).
 class PlatformAppApiTest : public ExtensionApiTest {
  public:
   PlatformAppApiTest();
   virtual ~PlatformAppApiTest();
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_