Move tests for the layout test plugin to the right fixture.

chrome/test/ui/npapi_uitest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 // windows headers
 #include <comutil.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 83 matching lines @@
 // original pointer is returned and not a proxy.  If this fails the plugin
 // will crash.
 TEST_F(NPAPITester, NPObjectProxy) {
   const FilePath test_case(FILE_PATH_LITERAL("npobject_proxy.html"));
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("npobject_proxy", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
 }
 
-// Tests if a plugin executing a self deleting script using NPN_GetURL
-// works without crashing or hanging
-TEST_F(NPAPITester, SelfDeletePluginGetUrl) {
-  const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_geturl.html"));
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
-  ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
-  WaitForFinish("self_delete_plugin_geturl", "1", url,
-                kTestCompleteCookie, kTestCompleteSuccess,
-                action_max_timeout_ms());
-}
-
-// Tests if a plugin executing a self deleting script using Invoke
-// works without crashing or hanging
-// Flaky. See http://crbug.com/30702
-TEST_F(NPAPITester, FLAKY_SelfDeletePluginInvoke) {
-  const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_invoke.html"));
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
-  ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
-  WaitForFinish("self_delete_plugin_invoke", "1", url,
-                kTestCompleteCookie, kTestCompleteSuccess,
-                action_max_timeout_ms());
-}
-
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // Tests if a plugin executing a self deleting script in the context of
 // a synchronous paint event works correctly
 // http://crbug.com/44960
 TEST_F(NPAPIVisiblePluginTester,
        FLAKY_SelfDeletePluginInvokeInSynchronousPaint) {
   if (UITest::in_process_renderer())
     return;
 
   show_window_ = true;
@@ skipping 219 matching lines @@
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   NavigateToURL(url);
   WaitForFinish("no_hang_if_init_crashes", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
                 action_max_timeout_ms());
   CloseHandle(crash_event);
 }
 
 #endif
 
-TEST_F(NPAPITester, NPObjectReleasedOnDestruction) {
-  if (UITest::in_process_renderer())
-    return;
-
-  const FilePath test_case(
-      FILE_PATH_LITERAL("npobject_released_on_destruction.html"));
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
-  ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
-
-  scoped_refptr<BrowserProxy> window_proxy(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(window_proxy);
-  ASSERT_TRUE(window_proxy->AppendTab(GURL(chrome::kAboutBlankURL)));
-
-  scoped_refptr<TabProxy> tab_proxy(window_proxy->GetTab(0));
-  ASSERT_TRUE(tab_proxy.get());
-  ASSERT_TRUE(tab_proxy->Close(true));
-}
-
-// Test that a dialog is properly created when a plugin throws an
-// exception.  Should be run for in and out of process plugins, but
-// the more interesting case is out of process, where we must route
-// the exception to the correct renderer.
-TEST_F(NPAPITester, NPObjectSetException) {
-  const FilePath test_case(FILE_PATH_LITERAL("npobject_set_exception.html"));
-  GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
-  ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
-  WaitForFinish("npobject_set_exception", "1", url,
-                kTestCompleteCookie, kTestCompleteSuccess,
-                action_max_timeout_ms());
-}
-
 TEST_F(NPAPIVisiblePluginTester, PluginReferrerTest) {
   if (UITest::in_process_renderer())
     return;
 
   GURL url(URLRequestMockHTTPJob::GetMockUrl(
                FilePath(FILE_PATH_LITERAL(
                             "npapi/plugin_url_request_referrer_test.html"))));
 
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
@@ skipping 16 matching lines @@
       FilePath(FILE_PATH_LITERAL("npapi/convert_point.html"))));
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
   // TODO(stuartmorgan): When the automation system supports sending clicks,
   // change the test to trigger on mouse-down rather than window focus.
   ASSERT_TRUE(browser->BringToFront());
   WaitForFinish("convert_point", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
 }
 #endif