commit 21620c217aee78ca931cc6dc987010689939d87b
author yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 02 02:07:45 2012
committer yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 02 02:07:45 2012
tree 4f6576b6ed6447f797e90bbab3022cb6118f7c58
parent 319f8fda34f8f9915e04ea1797d7d1ba8e118d00

Fix the issue that Pepper Flash cannot load on Linux.

BUG=125480
TEST=None


Review URL: http://codereview.chromium.org/10281007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134856 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browser_process_impl.cc

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 42eff0c..6fa799f 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -769,7 +769,8 @@
   bool add_at_beginning = false;
   chrome::ChromeContentClient* content_client =
       static_cast<chrome::ChromeContentClient*>(content::GetContentClient());
-  if (content_client->GetBundledPepperFlash(&plugin, &add_at_beginning)) {
+  if (content_client->GetBundledFieldTrialPepperFlash(&plugin,
+                                                      &add_at_beginning)) {
     plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(),
                                            add_at_beginning);
   }