Remove unused Flash-related code:

chrome/common/chrome_content_client.h

 // 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.
 
 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
       int resource_id,
       ui::ScaleFactor scale_factor) const OVERRIDE;
   virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   virtual bool GetSandboxProfileForSandboxType(
       int sandbox_type,
       int* sandbox_profile_resource_id) const OVERRIDE;
   virtual std::string GetCarbonInterposePath() const OVERRIDE;
 #endif
-
-  // Gets information about the bundled Pepper Flash for field trial.
-  // |override_npapi_flash| indicates whether it should take precedence over
-  // the internal NPAPI Flash.
-  // Returns false if bundled Pepper Flash is not available. In that case,
-  // |plugin| and |override_npapi_flash| are not touched.
-  //
-  // TODO(yzshen): We need this method because currently we are having a field
-  // trial with bundled Pepper Flash, and need extra information about how to
-  // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial
-  // is over, we should merge this into AddPepperPlugins().
-  bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin,
-                                       bool* override_npapi_flash);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_