Add an WebSocket extension browsertest.

This adds a simple browsertest that sanity checks that WebSockets can be opened and used from extension processes.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/660011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39961 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 46 deletions

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 7f8bdb8..20c197d 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -273,25 +273,6 @@ static CommandLine* CreateHttpServerCommandLine() {
   return cmd_line;
 }
 
-static CommandLine* CreateWebSocketServerCommandLine() {
-  FilePath src_path;
-  // Get to 'src' dir.
-  PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
-
-  FilePath script_path(src_path);
-  script_path = script_path.AppendASCII("webkit");
-  script_path = script_path.AppendASCII("tools");
-  script_path = script_path.AppendASCII("layout_tests");
-  script_path = script_path.AppendASCII("webkitpy");
-  script_path = script_path.AppendASCII("layout_tests");
-  script_path = script_path.AppendASCII("layout_package");
-  script_path = script_path.AppendASCII("websocket_server.py");
-
-  CommandLine* cmd_line = CreatePythonCommandLine();
-  cmd_line->AppendLooseValue(script_path.ToWStringHack());
-  return cmd_line;
-}
-
 static void RunCommand(const CommandLine& cmd_line) {
 #if defined(OS_WIN)
   // For Win32, use this 'version' of base::LaunchApp() with bInheritHandles
@@ -351,28 +332,6 @@ void UITestBase::StopHttpServer() {
   RunCommand(*cmd_line.get());
 }
 
-void UITestBase::StartWebSocketServer(const FilePath& root_directory) {
-  scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
-  ASSERT_TRUE(cmd_line.get());
-  cmd_line->AppendSwitchWithValue("server", "start");
-  cmd_line->AppendSwitch("register_cygwin");
-  cmd_line->AppendSwitchWithValue("root", root_directory.ToWStringHack());
-
-  websocket_pid_file_ = user_data_dir_.AppendASCII("websocket.pid");
-  cmd_line->AppendSwitchWithValue("pidfile",
-                                  websocket_pid_file_.ToWStringHack());
-  RunCommand(*cmd_line.get());
-}
-
-void UITestBase::StopWebSocketServer() {
-  scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
-  ASSERT_TRUE(cmd_line.get());
-  cmd_line->AppendSwitchWithValue("server", "stop");
-  cmd_line->AppendSwitchWithValue("pidfile",
-                                  websocket_pid_file_.ToWStringHack());
-  RunCommand(*cmd_line.get());
-}
-
 void UITestBase::LaunchBrowser(const CommandLine& arguments,
                                bool clear_profile) {
 #if defined(OS_POSIX)
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 6dc2a5a..a18b14b 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -484,11 +484,6 @@ class UITestBase {
                                const std::wstring& port);
   void StopHttpServer();
 
-  // Synchronously launches local websocket server used to run LayoutTests.
-  void StartWebSocketServer(const FilePath& root_directory);
-
-  void StopWebSocketServer();
-
   // Prints IO performance data for use by perf graphs.
   void PrintIOPerfInfo(const char* test_name);