Stop loading bundled Flash from chrome_content_client.cc

chrome/browser/component_updater/pepper_flash_component_installer.cc

 // Copyright (c) 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 "chrome/browser/component_updater/pepper_flash_component_installer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 21 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pepper_flash.h"
 #include "chrome/common/ppapi_utils.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/default_component_installer.h"
 #include "components/update_client/update_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
-#include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.  NOLINT
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 #if defined(OS_LINUX)
 #include "chrome/common/component_flash_hint_file_linux.h"
 #endif  // defined(OS_LINUX)
 
 using content::BrowserThread;
 using content::PluginService;
 
 namespace component_updater {
@@ skipping 38 matching lines @@
                                            content::kFlashPluginSwfExtension,
                                            content::kFlashPluginName);
   plugin_info->mime_types.push_back(swf_mime_type);
   content::WebPluginMimeType spl_mime_type(content::kFlashPluginSplMimeType,
                                            content::kFlashPluginSplExtension,
                                            content::kFlashPluginName);
   plugin_info->mime_types.push_back(spl_mime_type);
   return true;
 }
 
-bool IsPepperFlash(const content::WebPluginInfo& plugin) {
-  // We try to recognize Pepper Flash by the following criteria:
-  // * It is a Pepper plugin.
-  // * It has the special Flash permissions.
-  return plugin.is_pepper_plugin() &&
-         (plugin.pepper_permissions & ppapi::PERMISSION_FLASH);
-}
-
 // |path| is the path to the latest Chrome-managed Flash installation (bundled
 // or component updated).
 // |version| is the version of that Flash implementation.
 void RegisterPepperFlashWithChrome(const base::FilePath& path,
                                    const Version& version) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::PepperPluginInfo plugin_info;
   if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
     return;
+  content::WebPluginInfo web_plugin = plugin_info.ToWebPluginInfo();
 
   base::FilePath system_flash_path;
   PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN, &system_flash_path);
 
   std::vector<content::WebPluginInfo> plugins;
   PluginService::GetInstance()->GetInternalPlugins(&plugins);
   for (const auto& plugin : plugins) {
-    if (!IsPepperFlash(plugin))
+    if (!plugin.is_pepper_plugin() || plugin.name != web_plugin.name)
       continue;
 
     Version registered_version(base::UTF16ToUTF8(plugin.version));
 
     // If lower version, never register.
     if (registered_version.IsValid() &&
         version.CompareTo(registered_version) < 0) {
       return;
     }
 
@@ skipping 14 matching lines @@
         version.CompareTo(registered_version) == 0 &&
         (is_on_network || registered_is_debug_system)) {
       return;
     }
 
     // If the version is newer, remove the old one first.
     PluginService::GetInstance()->UnregisterInternalPlugin(plugin.path);
     break;
   }
 
-  PluginService::GetInstance()->RegisterInternalPlugin(
-      plugin_info.ToWebPluginInfo(), true);
+  PluginService::GetInstance()->RegisterInternalPlugin(web_plugin, true);
   PluginService::GetInstance()->RefreshPlugins();
 }
 
 void UpdatePathService(const base::FilePath& path) {
   PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
 }
 #endif  // !defined(OS_LINUX) && defined(GOOGLE_CHROME_BUILD)
 
 #if defined(GOOGLE_CHROME_BUILD)
 class FlashComponentInstallerTraits : public ComponentInstallerTraits {
@@ skipping 112 matching lines @@
   std::unique_ptr<ComponentInstallerTraits> traits(
       new FlashComponentInstallerTraits);
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
 }  // namespace component_updater