diff options
| author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 20:06:12 +0000 |
|---|---|---|
| committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 20:06:12 +0000 |
| commit | 1a5ee3acb408a74dee8585de8388a1b4b38a65ed (patch) | |
| tree | b129e63c431a3edaed758298a6d50ef82d207c98 /chrome/browser/extensions/execute_script_apitest.cc | |
| parent | 60e3b1afbb9c76f5fc7c14c724ebb31c9de1575b (diff) | |
| download | chromium_src-1a5ee3acb408a74dee8585de8388a1b4b38a65ed.zip chromium_src-1a5ee3acb408a74dee8585de8388a1b4b38a65ed.tar.gz chromium_src-1a5ee3acb408a74dee8585de8388a1b4b38a65ed.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/execute_script_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/execute_script_apitest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
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()); |