diff options
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 8 | ||||
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 9 |
2 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 675700a..0c814d2 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -9,13 +9,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -// http://crbug.com/111165 -#if defined(OS_WIN) -#define MAYBE_WebSocket DISABLED_WebSocket -#else -#define MAYBE_WebSocket WebSocket -#endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { FilePath websocket_root_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir)); // TODO(toyoshim): Remove following logging after a bug investigation. diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index 38c40d3..29c32d0 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -472,14 +472,7 @@ TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) { ASSERT_TRUE(http_server.Stop()); } -// TODO(toyoshim): Enable disabled tests. -// http://crbug.com/111165 . -#if defined(OS_WIN) -#define MAYBE_WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests -#else -#define MAYBE_WorkerWebSocketLayoutTests WorkerWebSocketLayoutTests -#endif -TEST_F(WorkerTest, MAYBE_WorkerWebSocketLayoutTests) { +TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "close-in-onmessage-crash.html", "close-in-shared-worker.html", |