Remove NPAPI support from Chrome Frame.

chrome_frame/test_utils.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "chrome_frame/test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
@@ skipping 60 matching lines @@
   if (registration_type == PER_USER) {
       register_server = reinterpret_cast<DllRegisterServerFn>(GetProcAddress(
           dll_handle, "DllRegisterUserServer"));
   } else {
       register_server = reinterpret_cast<DllRegisterServerFn>(GetProcAddress(
           dll_handle, "DllRegisterServer"));
   }
   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));
 }
 
 // static
 void ScopedChromeFrameRegistrar::UnregisterAtPath(
     const std::wstring& path, RegistrationType registration_type) {
 
   ASSERT_FALSE(path.empty());
   HMODULE dll_handle = LoadLibrary(path.c_str());
   ASSERT_TRUE(dll_handle != NULL);
 
   typedef HRESULT (STDAPICALLTYPE* DllUnregisterServerFn)();
   DllUnregisterServerFn unregister_server = NULL;
   if (registration_type == PER_USER) {
     unregister_server = reinterpret_cast<DllUnregisterServerFn>
         (GetProcAddress(dll_handle, "DllUnregisterUserServer"));
   } else {
     unregister_server = reinterpret_cast<DllUnregisterServerFn>
         (GetProcAddress(dll_handle, "DllUnregisterServer"));
   }
   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));
 }
 
 FilePath ScopedChromeFrameRegistrar::GetReferenceChromeFrameDllPath() {
   FilePath reference_build_dir;
   PathService::Get(chrome::DIR_APP, &reference_build_dir);
 
   reference_build_dir = reference_build_dir.DirName();
   reference_build_dir = reference_build_dir.DirName();
 
@@ skipping 228 matching lines @@
       UOI_NAME,
       name,
       sizeof(name),
       &needed)) {
         is_locked = lstrcmpi(name, L"default") != 0;
     }
     ::CloseDesktop(input_desk);
   }
   return is_locked;
 }