diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 19:51:17 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 19:51:17 +0000 |
| commit | ff6020bd43c51fd151a001043e7594da2f0316a4 (patch) | |
| tree | 45c3b44bfd043fd4efcafb8d275ddec0ab29a44f /chrome/browser/extensions/extension_websocket_apitest.cc | |
| parent | f7f61a1a6200c576cf2482374aae760bb3cd83be (diff) | |
| download | chromium_src-ff6020bd43c51fd151a001043e7594da2f0316a4.zip chromium_src-ff6020bd43c51fd151a001043e7594da2f0316a4.tar.gz chromium_src-ff6020bd43c51fd151a001043e7594da2f0316a4.tar.bz2 | |
Re-enable tests that were broken due to WebKit rename of DOMWindow to Window
The extension code was fixed in r123884
This is a revert of r123590.
BUG=None
TEST=ExtensionApiTest.GetViews:ExtensionApiTest.TabRelativeURLs:ExtensionApiTest.TabGetCurrent:ExtensionApiTest.TabReload:ExtensionApiTest.GetViewsOfCreatedPopup:ExtensionApiTest.GetViewsOfCreatedWindow:ExtensionApiTest.WebSocket:ExtensionApiTest.WindowOpener:ExtensionApiTest.MAYBE_Infobars
Review URL: http://codereview.chromium.org/9517002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124235 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 9157117..54f0936 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -8,7 +8,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { FilePath websocket_root_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir)); |