Revert r4094; ui_tests failures in SelfDeletePluginInvokeInSynchronousMouseMove.

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

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

3 files changed, 17 insertions, 48 deletions

diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc
index b0e7e91..868810e 100644
--- a/webkit/glue/plugins/test/plugin_client.cc
+++ b/webkit/glue/plugins/test/plugin_client.cc
@@ -102,7 +102,7 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode,
   } else if (base::strcasecmp(argv[name_index],
              "execute_script_delete_in_paint") == 0) {
     new_test = new NPAPIClient::ExecuteScriptDeleteTest(instance,
-      NPAPIClient::PluginClient::HostFunctions(), argv[name_index]);
+      NPAPIClient::PluginClient::HostFunctions());
     windowless_plugin = true;
   } else if (base::strcasecmp(argv[name_index], "getjavascripturl") == 0) {
     new_test = new NPAPIClient::ExecuteGetJavascriptUrlTest(instance,
@@ -137,11 +137,6 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode,
              "plugin_popup_with_plugin_target") == 0) {
     new_test = new NPAPIClient::ExecuteJavascriptPopupWindowTargetPluginTest(
         instance, NPAPIClient::PluginClient::HostFunctions());
-  } else if (base::strcasecmp(argv[name_index],
-                              "execute_script_delete_in_mouse_move") == 0) {
-    new_test = new NPAPIClient::ExecuteScriptDeleteTest(instance,
-      NPAPIClient::PluginClient::HostFunctions(), argv[name_index]);
-    windowless_plugin = true;
   } else {
     // If we don't have a test case for this, create a
     // generic one which basically never fails.
diff --git a/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc b/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc
index 3f1d0e1..7137ceb 100644
--- a/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc
+++ b/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc
@@ -8,47 +8,25 @@
 
 namespace NPAPIClient {
 
-ExecuteScriptDeleteTest::ExecuteScriptDeleteTest(
-    NPP id, NPNetscapeFuncs *host_functions, const std::string& test_name)
-  : PluginTest(id, host_functions),
-    test_name_(test_name) {
+ExecuteScriptDeleteTest::ExecuteScriptDeleteTest(NPP id, NPNetscapeFuncs *host_functions)
+  : PluginTest(id, host_functions) {
 }
 
 int16 ExecuteScriptDeleteTest::HandleEvent(void* event) {
-
-  NPNetscapeFuncs* browser = NPAPIClient::PluginClient::HostFunctions();  
-  
-  NPBool supports_windowless = 0;
-  NPError result = browser->getvalue(id(), NPNVSupportsWindowless,
-                                     &supports_windowless);
-  if ((result != NPERR_NO_ERROR) || (supports_windowless != TRUE)) {
-    SetError("Failed to read NPNVSupportsWindowless value");
-    SignalTestCompleted();
-    return PluginTest::HandleEvent(event);
-  }
-
   NPEvent* np_event = reinterpret_cast<NPEvent*>(event);
-  if (WM_PAINT == np_event->event && 
-      base::strcasecmp(test_name_.c_str(),
-                       "execute_script_delete_in_paint") == 0) {
-    NPUTF8* urlString = "javascript:DeletePluginWithinScript()";
-    NPUTF8* targetString = NULL;
-    browser->geturl(id(), urlString, targetString);
-    SignalTestCompleted();
-  } else if (WM_MOUSEMOVE == np_event->event && 
-             base::strcasecmp(test_name_.c_str(),
-                              "execute_script_delete_in_mouse_move") == 0) {
-    std::string script = "javascript:DeletePluginWithinScript()";
-    NPString script_string;
-    script_string.UTF8Characters = script.c_str();
-    script_string.UTF8Length = 
-        static_cast<unsigned int>(script.length());
-
-    NPObject *window_obj = NULL;
-    browser->getvalue(id(), NPNVWindowNPObject, &window_obj);
-    NPVariant result_var;
-    NPError result = browser->evaluate(id(), window_obj,
-                                       &script_string, &result_var);
+  if (WM_PAINT == np_event->event ) {
+    NPNetscapeFuncs* browser = NPAPIClient::PluginClient::HostFunctions();
+
+    NPBool supports_windowless = 0;
+    NPError result = browser->getvalue(id(), NPNVSupportsWindowless,
+                                       &supports_windowless);
+    if ((result != NPERR_NO_ERROR) || (supports_windowless != TRUE)) {
+      SetError("Failed to read NPNVSupportsWindowless value");
+    } else {
+      NPUTF8* urlString = "javascript:DeletePluginWithinScript()";
+      NPUTF8* targetString = NULL;
+      browser->geturl(id(), urlString, targetString);
+    }
     SignalTestCompleted();
   }
   // If this test failed, then we'd have crashed by now.
diff --git a/webkit/glue/plugins/test/plugin_execute_script_delete_test.h b/webkit/glue/plugins/test/plugin_execute_script_delete_test.h
index 92a1d04..5266d6d 100644
--- a/webkit/glue/plugins/test/plugin_execute_script_delete_test.h
+++ b/webkit/glue/plugins/test/plugin_execute_script_delete_test.h
@@ -14,13 +14,9 @@ namespace NPAPIClient {
 class ExecuteScriptDeleteTest : public PluginTest {
  public:
   // Constructor.
-  ExecuteScriptDeleteTest(NPP id, NPNetscapeFuncs *host_functions,
-                          const std::string& test_name);
+  ExecuteScriptDeleteTest(NPP id, NPNetscapeFuncs *host_functions);
   // NPAPI HandleEvent handler
   virtual int16 HandleEvent(void* event);
-
- private:
-  std::string test_name_;
 };
 
 } // namespace NPAPIClient