summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_websocket_apitest.cc
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 10:29:43 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 10:29:43 +0000
commit875ca807b69e3b11c4a5dbae4ff0909a3f269e77 (patch)
treea0405f257e070780a787a0d412922161f72a71ce /chrome/browser/extensions/extension_websocket_apitest.cc
parent0524b03b9b4bc06678cfbb921073c19327f50fca (diff)
downloadchromium_src-875ca807b69e3b11c4a5dbae4ff0909a3f269e77.zip
chromium_src-875ca807b69e3b11c4a5dbae4ff0909a3f269e77.tar.gz
chromium_src-875ca807b69e3b11c4a5dbae4ff0909a3f269e77.tar.bz2
Disable ExtensionApiTest.WebSocket on Windows.
TBR=hbono@chromium.org BUG=111165 TEST=Win bots turn green Review URL: https://chromiumcodereview.appspot.com/9117026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_websocket_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_websocket_apitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc
index 0c814d2..f260a24 100644
--- a/chrome/browser/extensions/extension_websocket_apitest.cc
+++ b/chrome/browser/extensions/extension_websocket_apitest.cc
@@ -9,7 +9,13 @@
#include "chrome/test/base/ui_test_utils.h"
#include "net/base/mock_host_resolver.h"
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {
+// http://crbug.com/111165
+#if defined(OS_WIN)
+#define MAYBE_WebSocket FAILS_WebSocket
+#else
+#define MAYBE_WebSocket WebSocket
+#endif
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_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.