Remove 1) NPAPI support from Chrome Frame and 2) Firefox/Opera/Safari tests.

BUG=none
TEST=automated testing should suffice
R=ananta@chromium.org,robertshield@chromium.org

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

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

1 files changed, 0 insertions, 28 deletions

diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index 0634d47..f90db60 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -78,20 +78,6 @@ void ScopedChromeFrameRegistrar::RegisterAtPath(
   ASSERT_TRUE(register_server != NULL);
   EXPECT_HRESULT_SUCCEEDED((*register_server)());
 
-  DllRegisterServerFn register_npapi_server = NULL;
-  if (registration_type == PER_USER) {
-    register_npapi_server =
-        reinterpret_cast<DllRegisterServerFn>(GetProcAddress(
-            dll_handle, "RegisterNPAPIUserPlugin"));
-  } else {
-    register_npapi_server =
-        reinterpret_cast<DllRegisterServerFn>(GetProcAddress(
-            dll_handle, "RegisterNPAPIPlugin"));
-  }
-
-  if (register_npapi_server != NULL)
-    EXPECT_HRESULT_SUCCEEDED((*register_npapi_server)());
-
   ASSERT_TRUE(FreeLibrary(dll_handle));
 }
 
@@ -115,20 +101,6 @@ void ScopedChromeFrameRegistrar::UnregisterAtPath(
   ASSERT_TRUE(unregister_server != NULL);
   EXPECT_HRESULT_SUCCEEDED((*unregister_server)());
 
-  DllUnregisterServerFn unregister_npapi_server = NULL;
-  if (registration_type == PER_USER) {
-    unregister_npapi_server =
-        reinterpret_cast<DllUnregisterServerFn>(GetProcAddress(
-            dll_handle, "UnregisterNPAPIUserPlugin"));
-  } else {
-    unregister_npapi_server =
-        reinterpret_cast<DllUnregisterServerFn>(GetProcAddress(
-            dll_handle, "UnregisterNPAPIPlugin"));
-  }
-
-  if (unregister_npapi_server != NULL)
-    EXPECT_HRESULT_SUCCEEDED((*unregister_npapi_server)());
-
   ASSERT_TRUE(FreeLibrary(dll_handle));
 }