Fix scripting during NPP_Destroy. Note that if the plugin is making a call t...

webkit/glue/plugins/test/plugin_client.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/string_util.h"
 #include "webkit/glue/plugins/test/plugin_client.h"
 #include "webkit/glue/plugins/test/plugin_arguments_test.h"
 #include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h"
 #include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h"
 #include "webkit/glue/plugins/test/plugin_get_javascript_url2_test.h"
@@ skipping 142 matching lines @@
   } else if (test_name == "plugin_popup_with_plugin_target") {
     new_test = new NPAPIClient::ExecuteJavascriptPopupWindowTargetPluginTest(
         instance, NPAPIClient::PluginClient::HostFunctions());
   } else if (test_name == "private") {
     new_test = new NPAPIClient::PrivateTest(instance,
       NPAPIClient::PluginClient::HostFunctions());
 #if defined(OS_WIN)
   // TODO(port): plugin_windowed_test.*.
   } else if (test_name == "hidden_plugin" ||
              test_name == "create_instance_in_paint" ||
-             test_name == "alert_in_window_message") {
+             test_name == "alert_in_window_message" ||
+             test_name == "ensure_scripting_works_in_destroy") {
     new_test = new NPAPIClient::WindowedPluginTest(instance,
         NPAPIClient::PluginClient::HostFunctions());
 #endif
   } else {
     // If we don't have a test case for this, create a
     // generic one which basically never fails.
     LOG(WARNING) << "Unknown test name '" << test_name
                  << "'; using default test.";
     new_test = new NPAPIClient::PluginTest(instance,
       NPAPIClient::PluginClient::HostFunctions());
@@ skipping 10 matching lines @@
 
   return ret;
 }
 
 NPError NPP_Destroy(NPP instance, NPSavedData** save) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
   NPAPIClient::PluginTest *plugin =
     (NPAPIClient::PluginTest*)instance->pdata;
+
+  NPError rv = plugin->Destroy();
   delete plugin;
-
-  // XXXMB - do work here.
-  return NPERR_GENERIC_ERROR;
+  return rv;
 }
 
 NPError NPP_SetWindow(NPP instance, NPWindow* pNPWindow) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
   if (pNPWindow->window == NULL) {
     return NPERR_NO_ERROR;
   }
 
@@ skipping 97 matching lines @@
     (NPAPIClient::PluginTest*)instance->pdata;
 
   return plugin->HandleEvent(event);
 }
 
 void* NPP_GetJavaClass(void) {
   // XXXMB - do work here.
   return NULL;
 }
 } // extern "C"