Fix the issue that Pepper Flash cannot load on Linux.

chrome/common/chrome_content_client.h

Index: chrome/common/chrome_content_client.h
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index 033226a5719f11f3ea700125ed2e911eef585359..a3ec38904c5eece7d322c30b58b350238b59436d 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -46,8 +46,9 @@ class ChromeContentClient : public content::ContentClient {
       int* sandbox_profile_resource_id) const OVERRIDE;
 #endif
 
-  // Gets information about the bundled Pepper Flash. |override_npapi_flash|
-  // indicates whether it should take precedence over the internal NPAPI Flash.
+  // 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.
   //
@@ -55,8 +56,8 @@ class ChromeContentClient : public content::ContentClient {
   // 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 GetBundledPepperFlash(content::PepperPluginInfo* plugin,
-                             bool* override_npapi_flash);
+  bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin,
+                                       bool* override_npapi_flash);
 };
 
 }  // namespace chrome