| Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| index 88595a0a102d43db356ca9930e10a4c0b928a695..472e25c771a484231ef6cebc5811b37c436fd85c 100644
|
| --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| @@ -105,14 +105,6 @@
|
| (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);
|
| @@ -234,8 +226,9 @@
|
| // 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)
|
| }
|
|
|
|
|