Speculative fix for perf test performance regressions.

chrome/browser/component_updater/pepper_flash_component_installer.cc

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 41d146a119e0689cefcfd3bbffe0b03e466451f7..bbaf4040689c8cca26b0ab4cd8bb010eac0d0325 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -267,9 +267,12 @@ FlashComponentInstallerTraits::GetInstallerAttributes() const {
 void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
 #if defined(GOOGLE_CHROME_BUILD)
   // Component updated flash supersedes bundled flash therefore if that one
-  // is disabled then this one should never install.
+  // is disabled then this one should never install. Similarly, if there is a
+  // command-line specified Flash to use, do not replace it with a component
+  // version of Flash.
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash))
+  if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)
+      || cmd_line->HasSwitch(switches::kPpapiFlashPath))
     return;
   std::unique_ptr<ComponentInstallerTraits> traits(
       new FlashComponentInstallerTraits);