Remove NPAPI support from Chrome Frame.

chrome_frame/chrome_tab.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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
@@ skipping 467 matching lines @@
 }
 
 enum RegistrationFlags {
   ACTIVEX             = 0x0001,
   ACTIVEDOC           = 0x0002,
   GCF_PROTOCOL        = 0x0004,
   BHO_CLSID           = 0x0008,
   BHO_REGISTRATION    = 0x0010,
   TYPELIB             = 0x0020,
 
-  NPAPI_PLUGIN        = 0x1000,
-
   ALL                 = 0xFFFF
 };
 
 STDAPI CustomRegistration(UINT reg_flags, BOOL reg, bool is_system) {
   UINT flags = reg_flags;
 
   if (reg && (flags & (ACTIVEDOC | ACTIVEX)))
     flags |= (TYPELIB | GCF_PROTOCOL);
 
   HRESULT hr = S_OK;
@@ skipping 64 matching lines @@
                              "OaEnablePerUserTLibRegistration"));
       if (per_user_typelib_func) {
         (*per_user_typelib_func)();
       }
     }
     hr = (reg)?
         UtilRegisterTypeLib(_AtlComModule.m_hInstTypeLib, NULL, !is_system) :
         UtilUnRegisterTypeLib(_AtlComModule.m_hInstTypeLib, NULL, !is_system);
   }
 
-  if ((hr == S_OK) && (flags & NPAPI_PLUGIN)) {
-    hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_NPAPI, reg);
+  // Unconditionally remove NPAPI registration when unregistering any component.
+  if ((hr == S_OK) && !reg) {
+    // Ignore failures.
+    _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_NPAPI, reg);
+    UtilRemovePersistentNPAPIMarker();
   }
 
   if (hr == S_OK) {
     hr = _AtlModule.UpdateRegistryAppId(reg);
   }
 
   if (hr == S_OK) {
     if (reg) {
       hr = SetChromeFrameUA(is_system, L"1");
     } else {
       hr = SetChromeFrameUA(is_system, NULL);
     }
   }
   return hr;
 }
 
 
 
 // DllRegisterServer - Adds entries to the system registry
 STDAPI DllRegisterServer() {
   UINT flags =  ACTIVEX | ACTIVEDOC | TYPELIB | GCF_PROTOCOL |
                 BHO_CLSID | BHO_REGISTRATION;
 
-  if (UtilIsPersistentNPAPIMarkerSet()) {
-    flags |= NPAPI_PLUGIN;
-  }
-
   HRESULT hr = CustomRegistration(flags, TRUE, true);
   if (SUCCEEDED(hr)) {
     SetupRunOnce();
   }
 
   return hr;
 }
 
 // DllUnregisterServer - Removes entries from the system registry
 STDAPI DllUnregisterServer() {
   HRESULT hr = CustomRegistration(ALL, FALSE, true);
   return hr;
 }
 
 // DllRegisterServer - Adds entries to the HKCU hive in the registry
 STDAPI DllRegisterUserServer() {
   UINT flags =  ACTIVEX | ACTIVEDOC | TYPELIB | GCF_PROTOCOL |
                 BHO_CLSID | BHO_REGISTRATION;
 
-  if (UtilIsPersistentNPAPIMarkerSet()) {
-    flags |= NPAPI_PLUGIN;
-  }
-
   HRESULT hr = CustomRegistration(flags, TRUE, false);
   if (SUCCEEDED(hr)) {
     SetupRunOnce();
   }
 
   return hr;
 }
 
 // DllRegisterServer - Removes entries from the HKCU hive in the registry.
 STDAPI DllUnregisterUserServer() {
   HRESULT hr = CustomRegistration(ALL, FALSE, false);
   return hr;
 }
 
-// Registers the NPAPI plugin and sets the persistent marker that tells us
-// to re-register it through updates.
-STDAPI RegisterNPAPIPlugin() {
-  HRESULT hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_NPAPI,
-                                                      TRUE);
-  if (SUCCEEDED(hr) && _AtlModule.do_system_registration_) {
-    if (!UtilChangePersistentNPAPIMarker(true)) {
-      hr = E_FAIL;
-    }
-  }
-  return hr;
-}
-
-// Unregisters the NPAPI plugin and clears the persistent marker that tells us
-// to re-register it through updates.
-STDAPI UnregisterNPAPIPlugin() {
-  HRESULT hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_NPAPI,
-                                                      FALSE);
-  if (SUCCEEDED(hr) && _AtlModule.do_system_registration_) {
-    if (!UtilChangePersistentNPAPIMarker(false)) {
-      hr = E_FAIL;
-    }
-  }
-  return hr;
-}
-
-STDAPI RegisterNPAPIUserPlugin() {
-  _AtlModule.do_system_registration_ = false;
-  return RegisterNPAPIPlugin();
-}
-
-STDAPI UnregisterNPAPIUserPlugin() {
-  _AtlModule.do_system_registration_ = false;
-  return UnregisterNPAPIPlugin();
-}
-
 class SecurityDescBackup {
  public:
   explicit SecurityDescBackup(const std::wstring& backup_key)
       : backup_key_name_(backup_key) {}
   ~SecurityDescBackup() {}
 
   // Save given security descriptor to the backup key.
   bool SaveSecurity(const CSecurityDesc& sd) {
     CString str;
     if (!sd.ToString(&str))
@@ skipping 159 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }