Fix WorkerTest.WorkerWebSocketLayoutTests.

chrome/worker/worker_uitest.cc

 // Copyright (c) 2009 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 "base/file_path.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 427 matching lines @@
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(http_test_dir, worker_test_dir, kHttpPort);
 
   StartHttpServer(new_http_root_dir_);
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
   StopHttpServer();
 }
 
-// Times out, see http://crbug.com/49381
-TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) {
+TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "close-in-onmessage-crash.html",
     "close-in-shared-worker.html",
     "close-in-worker.html",
     "shared-worker-simple.html",
     "worker-handshake-challenge-randomness.html",
     "worker-simple.html"
   };
 
   FilePath websocket_test_dir;
   websocket_test_dir = websocket_test_dir.AppendASCII("http");
   websocket_test_dir = websocket_test_dir.AppendASCII("tests");
-  websocket_test_dir = websocket_test_dir.AppendASCII("websocket");
-  websocket_test_dir = websocket_test_dir.AppendASCII("tests");
 
   FilePath worker_test_dir;
+  worker_test_dir = worker_test_dir.AppendASCII("websocket");
+  worker_test_dir = worker_test_dir.AppendASCII("tests");
   worker_test_dir = worker_test_dir.AppendASCII("workers");
-  InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kWebSocketPort);
-  test_case_dir_ = test_case_dir_.AppendASCII("http");
-  test_case_dir_ = test_case_dir_.AppendASCII("tests");
-  test_case_dir_ = test_case_dir_.AppendASCII("websocket");
-  test_case_dir_ = test_case_dir_.AppendASCII("tests");
-  test_case_dir_ = test_case_dir_.AppendASCII("workers");
+  InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kHttpPort);
 
-  ui_test_utils::TestWebSocketServer websocket_server(
-      temp_test_dir_.AppendASCII("LayoutTests"));
+  FilePath websocket_root_dir(temp_test_dir_);
+  websocket_root_dir = websocket_root_dir.AppendASCII("LayoutTests");
+  ui_test_utils::TestWebSocketServer websocket_server(websocket_root_dir);
+
+  StartHttpServer(new_http_root_dir_);
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
-    RunLayoutTest(kLayoutTestFiles[i], kWebSocketPort);
+    RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
+  StopHttpServer();
 }
 
 TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "abort-exception-assert.html",
 #if defined(OS_WIN)
     // Fails on the mac (and linux?):
     // http://code.google.com/p/chromium/issues/detail?id=22599
     "close.html",
 #endif
@@ skipping 222 matching lines @@
   RunWorkerFileSystemLayoutTest("simple-persistent-sync.html");
 }
 
 TEST_F(WorkerTest, DISABLED_WorkerFileSystemAsyncOperationsTest) {
   RunWorkerFileSystemLayoutTest("async-operations.html");
 }
 
 TEST_F(WorkerTest, DISABLED_WorkerFileSystemSyncOperationsTest) {
   RunWorkerFileSystemLayoutTest("sync-operations.html");
 }