summaryrefslogtreecommitdiffstats
path: root/ppapi/tests
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-02 13:27:52 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-02 13:27:52 +0000
commit9e998c0f289483f5ca1f44cbcc1f31b2685fcde3 (patch)
treeff1e9ad3ec440a0882ff09e074dbcedf026a513c /ppapi/tests
parent043cf1d3648a1ef67f4a1471375c78c6ee7bdcb5 (diff)
downloadchromium_src-9e998c0f289483f5ca1f44cbcc1f31b2685fcde3.zip
chromium_src-9e998c0f289483f5ca1f44cbcc1f31b2685fcde3.tar.gz
chromium_src-9e998c0f289483f5ca1f44cbcc1f31b2685fcde3.tar.bz2
PPAPI: Make tests really delete the plugin on shutdown
The old code tried to set removePlugin on the plugin element itself. This ends up calling HasProperty and SetProperty on the scriptable object (usually MessageChannel's special forwarding NPObject, or the script object that the test might provide). So it usually gets ignored, so isn't there when we try to read it. BUG=314212 Review URL: https://codereview.chromium.org/47873009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests')
-rw-r--r--ppapi/tests/test_case.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/tests/test_case.html b/ppapi/tests/test_case.html
index 9da9c7c..1552ae2 100644
--- a/ppapi/tests/test_case.html
+++ b/ppapi/tests/test_case.html
@@ -13,7 +13,7 @@ function AdjustHeight(frameWin) {
// passed, or information about the failure if the test(s) did not pass.
function DidExecuteTests(result) {
var plugin = document.getElementById("plugin");
- if (plugin.removePlugin) {
+ if (plugin.parentNode.removePlugin) {
plugin.parentNode.removeChild(plugin);
plugin = undefined;
}
@@ -127,7 +127,7 @@ function LogHTML(html) {
}
function RemovePluginWhenFinished() {
- window.document.getElementById("plugin").removePlugin = true;
+ window.document.getElementById("container").removePlugin = true;
}
function sendAutomationMessage(msg) {