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

chrome/test/ui/npapi_uitest.cc

 // Copyright (c) 2009 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.
 
 // windows headers
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <comutil.h>
 
@@ skipping 141 matching lines @@
   ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0));
 
   WaitForFinish("self_delete_plugin_invoke_alert", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
                 kShortWaitTimeout);
 }
 
 // Tests if a plugin executing a self deleting script in the context of
 // a synchronous paint event works correctly
 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousPaint) {
-  if (!UITest::in_process_renderer()) {
-    show_window_ = true;
-    std::wstring test_case = L"execute_script_delete_in_paint.html";
-    GURL url = GetTestUrl(L"npapi", test_case);
-    NavigateToURL(url);
-    WaitForFinish("execute_script_delete_in_paint", "1", url,
-                  kTestCompleteCookie, kTestCompleteSuccess,
-                  kShortWaitTimeout);
-  }
+  if (UITest::in_process_renderer())
+    return;
+
+  show_window_ = true;
+  std::wstring test_case = L"execute_script_delete_in_paint.html";
+  GURL url = GetTestUrl(L"npapi", test_case);
+  NavigateToURL(url);
+  WaitForFinish("execute_script_delete_in_paint", "1", url,
+                kTestCompleteCookie, kTestCompleteSuccess,
+                kShortWaitTimeout);
 }
 
 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) {
-  if (!UITest::in_process_renderer()) {
-    show_window_ = true;
-    std::wstring test_case = L"self_delete_plugin_stream.html";
-    GURL url = GetTestUrl(L"npapi", test_case);
-    NavigateToURL(url);
-    WaitForFinish("self_delete_plugin_stream", "1", url,
-                  kTestCompleteCookie, kTestCompleteSuccess,
-                  kShortWaitTimeout);
-  }
+  if (UITest::in_process_renderer())
+    return;
+
+  show_window_ = true;
+  std::wstring test_case = L"self_delete_plugin_stream.html";
+  GURL url = GetTestUrl(L"npapi", test_case);
+  NavigateToURL(url);
+  WaitForFinish("self_delete_plugin_stream", "1", url,
+                kTestCompleteCookie, kTestCompleteSuccess,
+                kShortWaitTimeout);
 }
 
 // Tests if a plugin has a non zero window rect.
 TEST_F(NPAPIVisiblePluginTester, VerifyPluginWindowRect) {
   show_window_ = true;
   std::wstring test_case = L"verify_plugin_window_rect.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
   WaitForFinish("checkwindowrect", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
@@ skipping 35 matching lines @@
       &available_buttons));
   ASSERT_TRUE(modal_dialog_showing);
   ASSERT_NE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons), 0);
   ASSERT_TRUE(automation()->ClickAppModalDialogButton(
       MessageBoxFlags::DIALOGBUTTON_OK));
 }
 
 #endif
 
 TEST_F(NPAPIVisiblePluginTester, VerifyNPObjectLifetimeTest) {
-  if (!UITest::in_process_renderer()) {
-    show_window_ = true;
-    std::wstring test_case = L"npobject_lifetime_test.html";
-    GURL url = GetTestUrl(L"npapi", test_case);
-    NavigateToURL(url);
-    WaitForFinish("npobject_lifetime_test", "1", url,
-                  kTestCompleteCookie, kTestCompleteSuccess,
-                  kShortWaitTimeout);
-  }
+  if (UITest::in_process_renderer())
+    return;
+
+  show_window_ = true;
+  std::wstring test_case = L"npobject_lifetime_test.html";
+  GURL url = GetTestUrl(L"npapi", test_case);
+  NavigateToURL(url);
+  WaitForFinish("npobject_lifetime_test", "1", url,
+                kTestCompleteCookie, kTestCompleteSuccess,
+                kShortWaitTimeout);
 }
 
 // Tests that we don't crash or assert if NPP_New fails
 TEST_F(NPAPIVisiblePluginTester, NewFails) {
   GURL url = GetTestUrl(L"npapi", L"new_fails.html");
   NavigateToURL(url);
   WaitForFinish("new_fails", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNPNEvaluate) {
-  if (!UITest::in_process_renderer()) {
-    GURL url = GetTestUrl(L"npapi",
-                          L"execute_script_delete_in_npn_evaluate.html");
-    NavigateToURL(url);
-    WaitForFinish("npobject_delete_plugin_in_evaluate", "1", url,
-                  kTestCompleteCookie, kTestCompleteSuccess,
-                  kShortWaitTimeout);
-  }
+  if (UITest::in_process_renderer())
+    return;
+
+  GURL url = GetTestUrl(L"npapi",
+                        L"execute_script_delete_in_npn_evaluate.html");
+  NavigateToURL(url);
+  WaitForFinish("npobject_delete_plugin_in_evaluate", "1", url,
+                kTestCompleteCookie, kTestCompleteSuccess,
+                kShortWaitTimeout);
 }
 
 // Flaky. See http://crbug.com/17645
 TEST_F(NPAPIVisiblePluginTester, DISABLED_OpenPopupWindowWithPlugin) {
   GURL url = GetTestUrl(L"npapi",
                         L"get_javascript_open_popup_with_plugin.html");
   NavigateToURL(url);
   WaitForFinish("plugin_popup_with_plugin_target", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
                 action_timeout_ms());
@@ skipping 38 matching lines @@
     return;
 
   GURL url(URLRequestMockHTTPJob::GetMockUrl(
       L"npapi/plugin_url_request_fail_write.html"));
 
   NavigateToURL(url);
 
   WaitForFinish("geturl_fail_write", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
+
+TEST_F(NPAPITester, EnsureScriptingWorksInDestroy) {
+  if (UITest::in_process_renderer())
+    return;
+
+  GURL url = GetTestUrl(L"npapi", L"ensure_scripting_works_in_destroy.html");
+  NavigateToURL(url);
+  WaitForFinish("ensure_scripting_works_in_destroy", "1", url,
+                kTestCompleteCookie, kTestCompleteSuccess,
+                kShortWaitTimeout);
+}