summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-05 22:09:54 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-05 22:09:54 +0000
commite26296cb84cd5d412d83ed200adde66ba8f5f507 (patch)
tree0a5f1395ca2dfc18a29454a76a3841282407f6ab /webkit
parent62050ec8aab10d069e27b66552933009c0cf6bd8 (diff)
downloadchromium_src-e26296cb84cd5d412d83ed200adde66ba8f5f507.zip
chromium_src-e26296cb84cd5d412d83ed200adde66ba8f5f507.tar.gz
chromium_src-e26296cb84cd5d412d83ed200adde66ba8f5f507.tar.bz2
Renable PluginTest.OpenPopupWindowWithPlugin since I disabled it yesterday after the window parent change. Since it's ok now that the parent is the desktop (while it's hidden), this test needed to be updated. I've verified the original bug doesn't repro.
Also enable PluginTest.AlertInWindowMessage since it passes locally. Review URL: https://codereview.chromium.org/11358071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/test/plugin_javascript_open_popup.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc b/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
index bc91a65..c12edb5 100644
--- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
+++ b/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
@@ -67,7 +67,7 @@ bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
if (IsWindow(window_handle)) {
HWND parent_window = GetParent(window_handle);
- if (!IsWindow(parent_window) || parent_window == GetDesktopWindow())
+ if (!IsWindow(parent_window))
SetError("Windowed plugin instantiated with NULL parent");
return true;
}