| Index: chrome/common/chrome_content_client.cc
|
| diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
|
| index 20ba8876bd79e7d9d3672156011d40499d53f9f0..f8eeda9e79bbf16e05f88a5d692304600cee5267 100644
|
| --- a/chrome/common/chrome_content_client.cc
|
| +++ b/chrome/common/chrome_content_client.cc
|
| @@ -26,6 +26,7 @@
|
| #include "build/build_config.h"
|
| #include "chrome/common/child_process_logging.h"
|
| #include "chrome/common/chrome_constants.h"
|
| +#include "chrome/common/chrome_features.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/crash_keys.h"
|
| @@ -272,6 +273,13 @@ content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
|
| }
|
|
|
| bool GetCommandLinePepperFlash(content::PepperPluginInfo* plugin) {
|
| +#if defined(OS_CHROMEOS)
|
| + // On Chrome OS, we cannot test component flash updates reliably unless we
|
| + // guarantee that the component updated flash plugin will be used.
|
| + if (base::FeatureList::IsEnabled(features::kComponentFlashOnly))
|
| + return false;
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| const base::CommandLine::StringType flash_path =
|
| base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
|
| switches::kPpapiFlashPath);
|
|
|