Speculative fix for perf test performance regressions.

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 249 matching lines @@
 FlashComponentInstallerTraits::GetInstallerAttributes() const {
   return update_client::InstallerAttributes();
 }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
 }  // namespace
 
 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);
   // |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