From 1a5ee3acb408a74dee8585de8388a1b4b38a65ed Mon Sep 17 00:00:00 2001 From: "mihaip@chromium.org" Date: Wed, 13 Jul 2011 20:06:12 +0000 Subject: Forgot to actually re-enable the test in r92388. BUG=89076 TEST=no TBR=mpcomplete@chromium.org Review URL: http://codereview.chromium.org/7351027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92400 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/execute_script_apitest.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'chrome/browser/extensions/execute_script_apitest.cc') diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index 4b014b4..76926bd 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.cc @@ -55,14 +55,7 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; } -// Time-outy linux. http://crbug.com/89076 -#if defined(OS_LINUX) -#define MAYBE_NavigationRaceExecuteScript DISABLED_NavigationRaceExecuteScript -#else -#define MAYBE_NavigationRaceExecuteScript NavigationRaceExecuteScript -#endif -IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, - MAYBE_NavigationRaceExecuteScript) { +IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); -- cgit v1.1