Remove unused Flash-related code:

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 "base/command_line.h"
 #include "base/cpu.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 294 matching lines @@
   // Also get the version from the command-line. Should be something like 11.2
   // or 11.2.123.45.
   std::string flash_version =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kPpapiFlashVersion);
 
   plugins->push_back(
       CreatePepperFlashInfo(FilePath(flash_path), flash_version));
 }
 
-bool GetBundledPepperFlash(content::PepperPluginInfo* plugin,
-                           bool* override_npapi_flash) {
+bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kDisablePepperThreading) &&
       !command_line->HasSwitch(switches::kEnablePepperThreading)) {
     chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
     if (channel == chrome::VersionInfo::CHANNEL_CANARY)
       command_line->AppendSwitch(switches::kEnablePepperThreading);
   }
 
 #if defined(FLAPPER_AVAILABLE)
   // 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;
 
 // For Linux ia32, Flapper requires SSE2.
 #if defined(OS_LINUX) && defined(ARCH_CPU_X86)
   if (!base::CPU().has_sse2())
     return false;
 #endif  // ARCH_CPU_X86
 
   FilePath flash_path;
   if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path))
     return false;
 
-  bool force_enable =
-      command_line->HasSwitch(switches::kEnableBundledPpapiFlash);
-
   *plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING);
-  *override_npapi_flash = force_enable || IsPepperFlashEnabledByDefault();
   return true;
 #else
   return false;
 #endif  // FLAPPER_AVAILABLE
 }
 
 }  // namespace
 
 namespace chrome {
 
 const char* const ChromeContentClient::kPDFPluginName = ::kPDFPluginName;
 const char* const ChromeContentClient::kNaClPluginName = ::kNaClPluginName;
 const char* const ChromeContentClient::kNaClOldPluginName =
     ::kNaClOldPluginName;
 
 void ChromeContentClient::SetActiveURL(const GURL& url) {
   child_process_logging::SetActiveURL(url);
 }
 
 void ChromeContentClient::SetGpuInfo(const content::GPUInfo& gpu_info) {
   child_process_logging::SetGpuInfo(gpu_info);
 }
 
 void ChromeContentClient::AddPepperPlugins(
     std::vector<content::PepperPluginInfo>* plugins) {
   ComputeBuiltInPlugins(plugins);
   AddPepperFlashFromCommandLine(plugins);
 
-  // Don't try to register Pepper Flash if there exists a Pepper Flash field
-  // trial. It will be registered separately.
-  if (!ConductingPepperFlashFieldTrial() && IsPepperFlashEnabledByDefault()) {
-    content::PepperPluginInfo plugin;
-    bool add_at_beginning = false;
-    if (GetBundledPepperFlash(&plugin, &add_at_beginning))
-      plugins->push_back(plugin);
-  }
+  content::PepperPluginInfo plugin;
+  if (GetBundledPepperFlash(&plugin))
+    plugins->push_back(plugin);
 }
 
 void ChromeContentClient::AddNPAPIPlugins(
     webkit::npapi::PluginList* plugin_list) {
 }
 
 void ChromeContentClient::AddAdditionalSchemes(
     std::vector<std::string>* standard_schemes,
     std::vector<std::string>* savable_schemes) {
   standard_schemes->push_back(extensions::kExtensionScheme);
@@ skipping 67 matching lines @@
     return true;
   }
   return false;
 }
 
 std::string ChromeContentClient::GetCarbonInterposePath() const {
   return std::string(kInterposeLibraryPath);
 }
 #endif
 
-bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
-    content::PepperPluginInfo* plugin,
-    bool* override_npapi_flash) {
-  if (!ConductingPepperFlashFieldTrial())
-    return false;
-  return GetBundledPepperFlash(plugin, override_npapi_flash);
-}
-
 }  // namespace chrome