diff options
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 10 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 7326fcb..96aad30 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -7,14 +7,14 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -// Disable this test on Linux, because it fails -// http://crbug.com/40976 -#if defined(OS_LINUX) +// Disable this test on Windows, because it fails +// http://crbug.com/40976, http://crbug.com/41319 +// https://bugs.webkit.org/show_bug.cgi?id=37518 +#if defined(OS_WIN) #define WebSocket DISABLED_WebSocket #endif -// This test is disabled. See bug 41319 -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { FilePath websocket_root_dir; PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir); websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests") diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index e59580b..557ab5b 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -394,7 +394,12 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) { } // http://crbug.com/40995 -TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) { +// https://bugs.webkit.org/show_bug.cgi?id=37518 +#if defined(OS_WIN) +#define WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests +#endif + +TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "worker-simple.html", "shared-worker-simple.html", |