Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5532)

Unified Diff: chrome/test/data/prerender/plugin_never_load.html

Issue 1062163004: Plugins: Move Prerender tests to PPAPI and some refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/prerender/plugin_never_load.html
diff --git a/chrome/test/data/prerender/prerender_plugin_power_saver.html b/chrome/test/data/prerender/plugin_never_load.html
similarity index 46%
rename from chrome/test/data/prerender/prerender_plugin_power_saver.html
rename to chrome/test/data/prerender/plugin_never_load.html
index fab134206c673034ffaf475dad2cfe2fddbfa384..84dc722622cce16759578b6a9be3ac31a0f5d33c 100644
--- a/chrome/test/data/prerender/prerender_plugin_power_saver.html
+++ b/chrome/test/data/prerender/plugin_never_load.html
@@ -1,10 +1,14 @@
<html>
<!--
This test checks to make sure plugins aren't loaded when a page is prerendered,
-but are loaded once the page is displayed and Plugin Power Saver is enabled.
+and are also not loaded once the page is displayed. This is used to test certain
+content settings that do not allow plugin loading.
+
+This test relies on the Pepper plugin (but not the placeholder) implementing
+the postMessage() function on the plugin object.
-->
<head>
-<title>Prerender Plugin Power Saver</title>
+<title>Prerender Plugin Never Load</title>
<script>
// Make sure plugin was not loaded while prerendering.
@@ -12,18 +16,18 @@ function DidPrerenderPass() {
// |plugin| should be the blocked plugin placeholder, rather than the
// test plugin.
var plugin = window.document['plugin'];
- return plugin.getURL == undefined;
+ return plugin.postMessage == undefined;
}
-// Make sure plugin loads once the page is displayed.
+// Make sure plugin still does not load once the page is displayed.
function DidDisplayPass() {
var plugin = window.document['plugin'];
- return plugin.getURL != undefined;
+ return plugin.postMessage == undefined;
}
</script>
</head>
<body>
-<embed name="plugin" type="application/x-webkit-test-netscape"></embed>
+<embed name="plugin" type="application/x-ppapi-tests"></embed>
</body>
</html>
« no previous file with comments | « chrome/test/data/prerender/plugin_delay_load.html ('k') | chrome/test/data/prerender/prerender_plugin_power_saver.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698