summaryrefslogtreecommitdiffstats
path: root/chrome/browser/infobars
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 19:51:17 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 19:51:17 +0000
commitff6020bd43c51fd151a001043e7594da2f0316a4 (patch)
tree45c3b44bfd043fd4efcafb8d275ddec0ab29a44f /chrome/browser/infobars
parentf7f61a1a6200c576cf2482374aae760bb3cd83be (diff)
downloadchromium_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/infobars')
-rw-r--r--chrome/browser/infobars/infobar_extension_apitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/infobars/infobar_extension_apitest.cc b/chrome/browser/infobars/infobar_extension_apitest.cc
index 1c7eb48..ded53b7 100644
--- a/chrome/browser/infobars/infobar_extension_apitest.cc
+++ b/chrome/browser/infobars/infobar_extension_apitest.cc
@@ -14,7 +14,7 @@
#define MAYBE_Infobars DISABLED_Infobars
#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Infobars) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Infobars) {
// TODO(finnur): Remove once infobars are no longer experimental (bug 39511).
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);