Revert of Rearrange Flash component registration.

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 87 matching lines @@
 }
 
 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;
 
+  base::FilePath bundled_flash_dir;
+  PathService::Get(chrome::DIR_PEPPER_FLASH_PLUGIN, &bundled_flash_dir);
   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))
       continue;
 
     Version registered_version(base::UTF16ToUTF8(plugin.version));
 
     // If lower version, never register.
     if (registered_version.IsValid() &&
         version.CompareTo(registered_version) < 0) {
       return;
     }
 
+    bool registered_is_bundled =
+        !bundled_flash_dir.empty() && bundled_flash_dir.IsParent(plugin.path);
     bool registered_is_debug_system =
         !system_flash_path.empty() &&
         base::FilePath::CompareEqualIgnoreCase(plugin.path.value(),
                                                system_flash_path.value()) &&
         chrome::IsSystemFlashScriptDebuggerPresent();
     bool is_on_network = false;
 #if defined(OS_WIN)
     // On Windows, component updated DLLs can't load off network drives.
     // See crbug.com/572131 for details.
     is_on_network = base::IsOnNetworkDrive(path);
 #endif
     // If equal version, register iff component is not on a network drive,
-    // and the version of flash is not debug system.
+    // and the version of flash is not bundled, and not debug system.
     if (registered_version.IsValid() &&
         version.CompareTo(registered_version) == 0 &&
-        (is_on_network || registered_is_debug_system)) {
+        (is_on_network || registered_is_bundled ||
+         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()->RefreshPlugins();
 }
 
-void UpdatePathService(const base::FilePath& path) {
+void NotifyPathServiceAndChrome(const base::FilePath& path,
+                                const Version& version) {
   PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&RegisterPepperFlashWithChrome, path, version));
 }
 #endif  // !defined(OS_LINUX) && defined(GOOGLE_CHROME_BUILD)
 
 #if defined(GOOGLE_CHROME_BUILD)
 class FlashComponentInstallerTraits : public ComponentInstallerTraits {
  public:
   FlashComponentInstallerTraits();
   ~FlashComponentInstallerTraits() override {}
 
  private:
@@ skipping 45 matching lines @@
 }
 
 void FlashComponentInstallerTraits::ComponentReady(
     const base::Version& version,
     const base::FilePath& path,
     std::unique_ptr<base::DictionaryValue> manifest) {
 #if !defined(OS_LINUX)
   // Installation is done. Now tell the rest of chrome. Both the path service
   // and to the plugin service. On Linux, a restart is required to use the new
   // Flash version, so we do not do this.
-  RegisterPepperFlashWithChrome(path, version);
   BrowserThread::GetBlockingPool()->PostTask(
-      FROM_HERE, base::Bind(&UpdatePathService, path));
+      FROM_HERE, base::Bind(&NotifyPathServiceAndChrome, path, version));
 #endif  // !defined(OS_LINUX)
 }
 
 bool FlashComponentInstallerTraits::VerifyInstallation(
     const base::DictionaryValue& manifest,
     const base::FilePath& install_dir) const {
   Version unused;
   return chrome::CheckPepperFlashManifest(manifest, &unused);
 }
 
@@ skipping 29 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