diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 12:22:19 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 12:22:19 +0000 |
| commit | 3367f02ec9f837a129de683872687c0dcfb0ff95 (patch) | |
| tree | 687076ebc0d6caf6f4f1e81ad81b73d14adff03c /chrome/test | |
| parent | f37112988970a359a7bfc39033c337ffc75563a4 (diff) | |
| download | chromium_src-3367f02ec9f837a129de683872687c0dcfb0ff95.zip chromium_src-3367f02ec9f837a129de683872687c0dcfb0ff95.tar.gz chromium_src-3367f02ec9f837a129de683872687c0dcfb0ff95.tar.bz2 | |
Revert 58814 - Increase the delay in WebNavigationEvents test from 500ms to 1s.
BUG=50943
TEST=WebNavigationEvents doesn't fail
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/3352011
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/3291017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/data/extensions/api_test/webnavigation/navigation/clientRedirect/a.html b/chrome/test/data/extensions/api_test/webnavigation/navigation/clientRedirect/a.html index 53ee79c..3e3e11a 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/navigation/clientRedirect/a.html +++ b/chrome/test/data/extensions/api_test/webnavigation/navigation/clientRedirect/a.html @@ -1,3 +1,3 @@ <script> - window.setTimeout('document.location = "b.html";', 1000); + window.setTimeout('document.location = "b.html";', 500); </script> diff --git a/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/a.html b/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/a.html index 31996a5..7b3462c 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/a.html +++ b/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/a.html @@ -1,6 +1,6 @@ <script> if (window.sessionStorage['redirected'] != 1) { window.sessionStorage['redirected'] = 1; - window.setTimeout('document.location = "b.html";', 1000); + window.setTimeout('document.location = "b.html";', 500); } </script> diff --git a/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/b.html b/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/b.html index 42441406..a4270ed 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/b.html +++ b/chrome/test/data/extensions/api_test/webnavigation/navigation/forwardBack/b.html @@ -1,3 +1,3 @@ <script> - window.setTimeout('history.back();', 1000); + window.setTimeout('history.back();', 500); </script> diff --git a/chrome/test/data/extensions/api_test/webnavigation/navigation/iframe/b.html b/chrome/test/data/extensions/api_test/webnavigation/navigation/iframe/b.html index 040adc0..d6e86d8 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/navigation/iframe/b.html +++ b/chrome/test/data/extensions/api_test/webnavigation/navigation/iframe/b.html @@ -1,3 +1,3 @@ <script> - window.setTimeout('document.location = "c.html";', 1000); + window.setTimeout('document.location = "c.html";', 500); </script> diff --git a/chrome/test/data/extensions/api_test/webnavigation/navigation/test.html b/chrome/test/data/extensions/api_test/webnavigation/navigation/test.html index 368ed15..4ac358d1 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/navigation/test.html +++ b/chrome/test/data/extensions/api_test/webnavigation/navigation/test.html @@ -45,7 +45,7 @@ chrome.tabs.getSelected(null, function(tab) { }, /* Navigates to a.html that redirects to b.html (using javascript) - after a delay of 1s, so the initial navigation is completed and + after a delay of 500ms, so the initial navigation is completed and the redirection is marked as client_redirect */ function clientRedirect() { expect([ |