Remove NPAPI from browser and utility

chrome/browser/extensions/plugin_manager.cc

 // Copyright 2013 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 "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/plugin_manager.h"
@@ skipping 30 matching lines @@
 
 // static
 BrowserContextKeyedAPIFactory<PluginManager>*
 PluginManager::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
                                       const Extension* extension) {
   bool plugins_or_nacl_changed = false;
-  if (PluginInfo::HasPlugins(extension)) {
-    const PluginInfo::PluginVector* plugins = PluginInfo::GetPlugins(extension);
-    CHECK(plugins);
-    plugins_or_nacl_changed = true;
-    for (PluginInfo::PluginVector::const_iterator plugin = plugins->begin();
-         plugin != plugins->end();
-         ++plugin) {
-      PluginService::GetInstance()->RefreshPlugins();
-      PluginService::GetInstance()->AddExtraPluginPath(plugin->path);
-      ChromePluginServiceFilter* filter =
-          ChromePluginServiceFilter::GetInstance();
-      if (plugin->is_public) {
-        filter->RestrictPluginToProfileAndOrigin(
-            plugin->path, profile_, GURL());
-      } else {
-        filter->RestrictPluginToProfileAndOrigin(
-            plugin->path, profile_, extension->url());
-      }
-    }
-  }

[piman, 2016/04/05 06:00:47]

Although it's not directly obvious, this only does anything for NPAPI plugins.

-
 #if !defined(DISABLE_NACL)
   const NaClModuleInfo::List* nacl_modules =
       NaClModuleInfo::GetNaClModules(extension);
   if (nacl_modules) {
     plugins_or_nacl_changed = true;
     for (NaClModuleInfo::List::const_iterator module = nacl_modules->begin();
          module != nacl_modules->end();
          ++module) {
       RegisterNaClModule(*module);
     }
@@ skipping 29 matching lines @@
 
   if (plugins_or_nacl_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 }
 
 void PluginManager::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   bool plugins_or_nacl_changed = false;
-  if (PluginInfo::HasPlugins(extension)) {
-    const PluginInfo::PluginVector* plugins = PluginInfo::GetPlugins(extension);
-    plugins_or_nacl_changed = true;
-    for (PluginInfo::PluginVector::const_iterator plugin = plugins->begin();
-         plugin != plugins->end();
-         ++plugin) {
-      PluginService::GetInstance()->ForcePluginShutdown(plugin->path);
-      PluginService::GetInstance()->RefreshPlugins();
-      PluginService::GetInstance()->RemoveExtraPluginPath(plugin->path);
-      ChromePluginServiceFilter::GetInstance()->UnrestrictPlugin(plugin->path);
-    }
-  }
-
 #if !defined(DISABLE_NACL)
   const NaClModuleInfo::List* nacl_modules =
       NaClModuleInfo::GetNaClModules(extension);
   if (nacl_modules) {
     plugins_or_nacl_changed = true;
     for (NaClModuleInfo::List::const_iterator module = nacl_modules->begin();
          module != nacl_modules->end();
          ++module) {
       UnregisterNaClModule(*module);
     }
     UpdatePluginListWithNaClModules();
   }
 #endif
 
   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
   if (handler && handler->HasPlugin()) {
     plugins_or_nacl_changed = true;
     base::FilePath path = handler->GetPluginPath();
     PluginService::GetInstance()->UnregisterInternalPlugin(path);
-    PluginService::GetInstance()->ForcePluginShutdown(path);
     PluginService::GetInstance()->RefreshPlugins();
   }
 
   if (plugins_or_nacl_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 }
 
 #if !defined(DISABLE_NACL)
 
 void PluginManager::RegisterNaClModule(const NaClModuleInfo& info) {
@@ skipping 60 matching lines @@
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }
 
 #endif  // !defined(DISABLE_NACL)
 
 }  // namespace extensions