diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 12:33:31 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 12:33:31 +0000 |
| commit | 88de7c35c421ad1e3cd13492960255309504afe2 (patch) | |
| tree | e4d551d7b1572f5b67c6b5043091b9d2caeea8e4 /chrome/test/data | |
| parent | e4f864978d24e79ed3a47142c3a146d09627d0d4 (diff) | |
| download | chromium_src-88de7c35c421ad1e3cd13492960255309504afe2.zip chromium_src-88de7c35c421ad1e3cd13492960255309504afe2.tar.gz chromium_src-88de7c35c421ad1e3cd13492960255309504afe2.tar.bz2 | |
PrerenderContents uses RESOURCE_RECEIVED_REDIRECT notification.
This removes the dependency on OnDidRedirectProvisionalLoad.
I also added a number of redirect-oriented browser tests.
BUG=78512
TEST=browser_tests --gtest_filter=PrerenderBrowserTest.*
Review URL: http://codereview.chromium.org/6824054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
| -rw-r--r-- | chrome/test/data/prerender/prerender_embedded_content.html | 8 | ||||
| -rw-r--r-- | chrome/test/data/prerender/prerender_redirect.html | 10 | ||||
| -rw-r--r-- | chrome/test/data/prerender/prerender_with_iframe.html | 27 |
3 files changed, 35 insertions, 10 deletions
diff --git a/chrome/test/data/prerender/prerender_embedded_content.html b/chrome/test/data/prerender/prerender_embedded_content.html new file mode 100644 index 0000000..914f5f6 --- /dev/null +++ b/chrome/test/data/prerender/prerender_embedded_content.html @@ -0,0 +1,8 @@ +<html> +<head> + <title>Embedded iframe</title> +</head> +<body> + Embedded iframe. +</body> +</html> diff --git a/chrome/test/data/prerender/prerender_redirect.html b/chrome/test/data/prerender/prerender_redirect.html deleted file mode 100644 index 78f0d08..0000000 --- a/chrome/test/data/prerender/prerender_redirect.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<!-- -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></body> -</html> diff --git a/chrome/test/data/prerender/prerender_with_iframe.html b/chrome/test/data/prerender/prerender_with_iframe.html new file mode 100644 index 0000000..e265118 --- /dev/null +++ b/chrome/test/data/prerender/prerender_with_iframe.html @@ -0,0 +1,27 @@ +<html> +<head> + <title>Prerender with iframe</title> + <script> + var pageWasPrerendered = false; + + function DidPrerenderPass() { + pageWasPrerendered = true; + return true; + } + + // Make sure DidPrerenderPass() was called first. Otherwise, the page was + // most likely reloaded instead of using the prerendered page. + function DidDisplayPass() { + return pageWasPrerendered; + } + </script> +</head> +<body> + <iframe name="iframe" + src="REPLACE_WITH_URL" + width="0" + height="0" + frameborder="0"> + </iframe> +</body> +</html> |