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

Unified Diff: chrome/browser/plugins/plugin_power_saver_browsertest.cc

Issue 1114623002: Plugin Power Saver: Make PPS work well with prerendered pages. (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
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_power_saver_browsertest.cc
diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
index 21336ad24389b6a5329825f2b1879265679a7917..c1314b6118d3b28a9a6c897e986f52e0e542e6b6 100644
--- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
+++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
@@ -40,22 +40,22 @@ class PluginPowerSaverBrowserTest : virtual public InProcessBrowserTest {
bool IsPluginPeripheral(const char* element_id) {
std::string script = base::StringPrintf(
"var plugin = window.document.getElementById('%s');"
- "function handleEvent() {"
+ "function handleEvent(event) {"
" if (event.data.isPeripheral != undefined &&"
- " event.data.source == 'getPeripheralStatusResponse') {"
+ " event.data.source === 'getPowerSaverStatusResponse') {"
" window.domAutomationController.send("
" event.data.isPeripheral ? 'peripheral' : 'essential');"
" plugin.removeEventListener('message', handleEvent);"
" }"
"}"
- "if (plugin == undefined ||"
+ "if (plugin === undefined ||"
" (plugin.nodeName != 'OBJECT' && plugin.nodeName != 'EMBED')) {"
" window.domAutomationController.send('error');"
- "} else if (plugin.postMessage == undefined) {"
+ "} else if (plugin.postMessage === undefined) {"
" window.domAutomationController.send('peripheral');"
"} else {"
" plugin.addEventListener('message', handleEvent);"
- " plugin.postMessage('getPeripheralStatus');"
+ " plugin.postMessage('getPowerSaverStatus');"
"}",
element_id);
@@ -71,7 +71,7 @@ class PluginPowerSaverBrowserTest : virtual public InProcessBrowserTest {
// status message during:
// - Plugin creation, to handle a plugin freshly created from a poster.
// - Peripheral status change.
- // - In response to the explicit 'getPeripheralStatus' request, in case the
+ // - In response to the explicit 'getPowerSaverStatus' request, in case the
// test has missed the above two events.
void SimulateClickAndAwaitMarkedEssential(const char* element_id,
const gfx::Point& point) {
@@ -80,19 +80,19 @@ class PluginPowerSaverBrowserTest : virtual public InProcessBrowserTest {
std::string script = base::StringPrintf(
"var plugin = window.document.getElementById('%s');"
- "function handleEvent() {"
- " if (event.data.isPeripheral == false) {"
+ "function handleEvent(event) {"
+ " if (event.data.isPeripheral === false) {"
" window.domAutomationController.send('essential');"
" plugin.removeEventListener('message', handleEvent);"
" }"
"}"
- "if (plugin == undefined ||"
+ "if (plugin === undefined ||"
" (plugin.nodeName != 'OBJECT' && plugin.nodeName != 'EMBED')) {"
" window.domAutomationController.send('error');"
"} else {"
" plugin.addEventListener('message', handleEvent);"
" if (plugin.postMessage != undefined) {"
- " plugin.postMessage('getPeripheralStatus');"
+ " plugin.postMessage('getPowerSaverStatus');"
" }"
"}",
element_id);
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698