diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 13:37:18 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 13:37:18 +0000 |
| commit | fffa2fa9e73c847128b5703e310184fee4a6d505 (patch) | |
| tree | a7d7231310f96d7ccb5b20ab7b89c7cfd4cfa482 /chrome/test | |
| parent | 46ab032905e9481a049d53e90f14aab774974131 (diff) | |
| download | chromium_src-fffa2fa9e73c847128b5703e310184fee4a6d505.zip chromium_src-fffa2fa9e73c847128b5703e310184fee4a6d505.tar.gz chromium_src-fffa2fa9e73c847128b5703e310184fee4a6d505.tar.bz2 | |
Deflake PrerenderBrowserTest.PrerenderRedirectToHttps
This also simplifies the PrerenderBrowserTest framework quite a bit. The main message loop is only run once, and is quit only if the correct number of loads have been seen for FINAL_STATUS_USED, or after the TestPrerenderContents are destroyed for all other final statuses.
BUG=73580
TEST=browser_tests --gtest_filter="PrerenderBrowserTest.*"
Review URL: http://codereview.chromium.org/6793018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/prerender/prerender_redirect.html | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/test/data/prerender/prerender_redirect.html b/chrome/test/data/prerender/prerender_redirect.html index 3cd14e4..78f0d08 100644 --- a/chrome/test/data/prerender/prerender_redirect.html +++ b/chrome/test/data/prerender/prerender_redirect.html @@ -4,13 +4,7 @@ This is used to test prerendering in the case of HTML redirection. --> <head> <title>Prerender Redirect</title> + <meta http-equiv="REFRESH" content="0;REPLACE_WITH_URL"> </head> -<body> - <script> - function OnIteration() { - document.location = 'REPLACE_WITH_URL'; - return true; - } - </script> -</body> +<body></body> </html> |