Stop loading bundled Flash from chrome_content_client.cc

chrome/common/chrome_content_client.cc

 // Copyright (c) 2012 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/common/chrome_content_client.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
@@ skipping 322 matching lines @@
       return true;
     }
     LOG(ERROR)
         << "Failed to locate and load the component updated flash plugin.";
   }
 #endif  // defined(FLAPPER_AVAILABLE)
   return false;
 }
 #endif  // defined(OS_LINUX)
 
-// Similar to GetComponentUpdatedPepperFlash, this should be used on Linux only
-// because on other platforms the component updater can take responsibility for
-// locating and registering the bundled version of Flash.
-// However, a large number of tests depend upon having Flash registered
-// *synchronously* during browser startup.
-// TODO(waffles): Fix those tests and then compile / run this only on Linux.
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+// This should be used on ChromeOS and Linux 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) || defined(OS_LINUX)
 
 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
   // the commmand-line.
   if (command_line->HasSwitch(switches::kPpapiFlashPath))
     return false;
 
   base::FilePath flash_filename;
   if (!PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
@@ skipping 148 matching lines @@
 
   ScopedVector<content::PepperPluginInfo> flash_versions;
 
 #if defined(OS_LINUX)
   std::unique_ptr<content::PepperPluginInfo> component_flash(
       new content::PepperPluginInfo);
   if (GetComponentUpdatedPepperFlash(component_flash.get()))
     flash_versions.push_back(component_flash.release());
 #endif  // defined(OS_LINUX)
 
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
   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) || defined(OS_LINUX)
 
   std::unique_ptr<content::PepperPluginInfo> system_flash(
       new content::PepperPluginInfo);
   if (GetSystemPepperFlash(system_flash.get()))
     flash_versions.push_back(system_flash.release());
 
   // This function will return only the most recent version of the flash plugin.
   content::PepperPluginInfo* max_flash =
       FindMostRecentPlugin(flash_versions.get());
   if (max_flash)
@@ skipping 162 matching lines @@
     origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy());
   }
   return origin_trial_policy_.get();
 }
 
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();
 }
 #endif  // OS_ANDROID