Revert of Fix assert in Flash component install.

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);
 }
 
-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));
-}
-
 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;
@@ skipping 101 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.
-  BrowserThread::GetBlockingPool()->PostTask(
-      FROM_HERE, base::Bind(&NotifyPathServiceAndChrome, path, version));
+  PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
+  RegisterPepperFlashWithChrome(path.Append(chrome::kPepperFlashPluginFilename),
+                                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 28 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