diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 00:49:20 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 00:49:20 +0000 |
| commit | 955b73964372469fe35b0162d37f4a357532d6f4 (patch) | |
| tree | d3e70fb4d2012238be882c6b37fe65d7f50686fe /chrome/browser/extensions/extension_websocket_apitest.cc | |
| parent | 1aa3c9c70c57cb1e53113d0eb119e667f3260c8e (diff) | |
| download | chromium_src-955b73964372469fe35b0162d37f4a357532d6f4.zip chromium_src-955b73964372469fe35b0162d37f4a357532d6f4.tar.gz chromium_src-955b73964372469fe35b0162d37f4a357532d6f4.tar.bz2 | |
This change enables ExtensionApiTest.WebSocket on Mac again.
BUG=56596
TEST=none
Review URL: http://codereview.chromium.org/6611007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_websocket_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index f8cbebc..76ae17e 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -8,14 +8,7 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -#if defined(OS_MACOSX) -// WebSocket test started timing out - suspect webkit roll from 67965->68051. -// http://crbug.com/56596 -#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; PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir); websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests") |