diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 15:03:03 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 15:03:03 +0000 |
| commit | 3af9e6274b5ab8939dd9def67c5a0c8f1aa21d15 (patch) | |
| tree | 00fc9454874fb8a74102e7a4e935ebbc68989898 /chrome/test | |
| parent | 88b5a92847caf1a3b90d6b54ea400651be80b21e (diff) | |
| download | chromium_src-3af9e6274b5ab8939dd9def67c5a0c8f1aa21d15.zip chromium_src-3af9e6274b5ab8939dd9def67c5a0c8f1aa21d15.tar.gz chromium_src-3af9e6274b5ab8939dd9def67c5a0c8f1aa21d15.tar.bz2 | |
BrowserTest to make sure plugins aren't loaded on prerendered pages
until the pages are loaded into a TabContents.
Also a little PrerenderBrowserTest cleanup.
BUG=71216
TEST=PrerenderBrowserTest.PrerenderDelayLoadPlugin
Review URL: http://codereview.chromium.org/6409023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/prerender/plugin_delay_load.html | 29 | ||||
| -rw-r--r-- | chrome/test/data/prerender/prerender_page.html | 4 |
2 files changed, 32 insertions, 1 deletions
diff --git a/chrome/test/data/prerender/plugin_delay_load.html b/chrome/test/data/prerender/plugin_delay_load.html new file mode 100644 index 0000000..b55262c --- /dev/null +++ b/chrome/test/data/prerender/plugin_delay_load.html @@ -0,0 +1,29 @@ +<html>
+<!--
+This test checks to make sure plugins aren't loaded when a page is prerendered,
+but are loaded once the page is displayed.
+-->
+<head>
+<title>Prerender Plugin Delay Loading</title>
+
+<script>
+// Make sure plugin was not loaded while prerendering.
+function DidPrerenderPass() {
+ // |plugin| should be the blocked plugin placeholder, rather than the
+ // test plugin.
+ var plugin = window.document['plugin'];
+ return plugin.getURL == undefined;
+}
+
+// Make sure plugin loads once the page is displayed.
+function DidDisplayPass() {
+ var plugin = window.document['plugin'];
+ return plugin.getURL != undefined;
+}
+</script>
+
+</head>
+<body>
+<embed name="plugin" type="application/x-webkit-test-netscape"></embed>
+</body>
+</html>
diff --git a/chrome/test/data/prerender/prerender_page.html b/chrome/test/data/prerender/prerender_page.html index c1e502a..f6cd5fb 100644 --- a/chrome/test/data/prerender/prerender_page.html +++ b/chrome/test/data/prerender/prerender_page.html @@ -6,6 +6,8 @@ This test checks to make sure that a prerendered page is loaded. <title>Prerender Plugin Delay Loading</title> <script> +var pageWasPrerendered = false; + // Make sure plugin was not loaded while prerendering. function DidPrerenderPass() { pageWasPrerendered = true; @@ -15,7 +17,7 @@ function DidPrerenderPass() { // Make sure DidPrerenderPass() was called first. Otherwise, the page was // most likely reloaded instead of using the prerendered page. function DidDisplayPass() { - return (pageWasPrerendered == true); + return pageWasPrerendered; } </script> |