Do not reference non-existant bundled flash on Chrome OS.

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 483c3c85ea823bb6b1260f7b3e1fab8ea3f2b92b..7e0785c44b63184b88778007a3ea71358297bea0 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -341,35 +341,6 @@ bool GetComponentUpdatedPepperFlash(content::PepperPluginInfo* plugin) {
 }
 #endif  // defined(OS_LINUX)
 
-#if defined(OS_CHROMEOS)
-// This should be used on ChromeOS only - other platforms do not bundle Flash.
-bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) {
-#if defined(FLAPPER_AVAILABLE)
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-
-  // Ignore bundled Pepper Flash if there is Pepper Flash specified from the
-  // command-line.
-  if (command_line->HasSwitch(switches::kPpapiFlashPath))
-    return false;
-
-  bool force_disable =
-      command_line->HasSwitch(switches::kDisableBundledPpapiFlash);
-  if (force_disable)
-    return false;
-
-  base::FilePath flash_path;
-  if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path))
-    return false;
-
-  *plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING, false,
-                                  false, true);
-  return true;
-#else
-  return false;
-#endif  // FLAPPER_AVAILABLE
-}
-#endif  // defined(OS_CHROMEOS)
-
 bool GetSystemPepperFlash(content::PepperPluginInfo* plugin) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   // Do not try and find System Pepper Flash if there is a specific path on
@@ -537,13 +508,6 @@ void ChromeContentClient::AddPepperPlugins(
     flash_versions.push_back(component_flash.release());
 #endif  // defined(OS_LINUX)
 
-#if defined(OS_CHROMEOS)
-  std::unique_ptr<content::PepperPluginInfo> bundled_flash(
-      new content::PepperPluginInfo);
-  if (GetBundledPepperFlash(bundled_flash.get()))
-    flash_versions.push_back(bundled_flash.release());
-#endif  // defined(OS_CHROMEOS)
-
   std::unique_ptr<content::PepperPluginInfo> system_flash(
       new content::PepperPluginInfo);
   if (GetSystemPepperFlash(system_flash.get()))