Activate / fix the NPAPI plugin test on Linux:

- My install won't tolerate NULLs to XQueryTree(), so fix.
- Need to flag the test plug-in as NOT an Xt-based plug-in.
- Enable the test in the .gypi.

BUG=30700
TEST=ui_tests,NPAPI*.*

Review URL: http://codereview.chromium.org/6349042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73434 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 1 deletions

diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/webkit/plugins/npapi/test/plugin_client.cc
index 527485d..2c27f63 100644
--- a/webkit/plugins/npapi/test/plugin_client.cc
+++ b/webkit/plugins/npapi/test/plugin_client.cc
@@ -208,6 +208,11 @@ NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
+  if (variable == NPPVpluginNeedsXEmbed) {
+    *static_cast<NPBool*>(value) = 1;
+    return NPERR_NO_ERROR;
+  }
+
   // XXXMB - do work here.
   return NPERR_GENERIC_ERROR;
 }
diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc b/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
index 583a55e..468b8d5 100644
--- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
+++ b/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
@@ -82,8 +82,12 @@ bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
 
   if (xwindow) {
     Window root, parent;
+    Window* wins = NULL;
+    unsigned int num_child;
     Status status = XQueryTree(extra->display, xwindow, &root, &parent,
-                               NULL, NULL);  // NULL children info.
+                               &wins, &num_child);
+    if (wins)
+      XFree(wins);
     DCHECK(status != 0);
     if (!parent || parent == root)
       SetError("Windowed plugin instantiated with NULL parent");