summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_webnavigation_apitest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 12:13:39 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 12:13:39 +0000
commit89b1769644f8a140ef663db69156a651422f50db (patch)
tree49eff03f7a9ec2c08c00b364d0de38775064d808 /chrome/browser/extensions/extension_webnavigation_apitest.cc
parent03aa1c6de1e3f2f8b6b862b3f642278431cab5b4 (diff)
downloadchromium_src-89b1769644f8a140ef663db69156a651422f50db.zip
chromium_src-89b1769644f8a140ef663db69156a651422f50db.tar.gz
chromium_src-89b1769644f8a140ef663db69156a651422f50db.tar.bz2
Refactor ExtensionApiTest.WebNavigationEvents* to not rely on window.setTimeout
BUG=70382,94932 TEST=tests still work Review URL: http://codereview.chromium.org/7859014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_webnavigation_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_webnavigation_apitest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_webnavigation_apitest.cc b/chrome/browser/extensions/extension_webnavigation_apitest.cc
index a7d2afa..f7a6fa64 100644
--- a/chrome/browser/extensions/extension_webnavigation_apitest.cc
+++ b/chrome/browser/extensions/extension_webnavigation_apitest.cc
@@ -144,14 +144,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
RunExtensionSubtest("webnavigation", "test_failures.html")) << message_;
}
-// Fails almost consistently on Mac only. http://crbug.com/94932
-#if defined(OS_MACOSX)
-#define MAYBE_WebNavigationUserAction FAILS_WebNavigationUserAction
-#else
-#define MAYBE_WebNavigationUserAction WebNavigationUserAction
-#endif
-
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebNavigationUserAction) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);