Chromium Code Reviews| Index: components/content_settings/core/browser/plugins_field_trial.cc |
| diff --git a/components/content_settings/core/browser/plugins_field_trial.cc b/components/content_settings/core/browser/plugins_field_trial.cc |
| index 98cd97a75487dd9a176d7e0e7d49a469475233cf..fa842f34460624f8dd5d255c6d61ac6b24430e7f 100644 |
| --- a/components/content_settings/core/browser/plugins_field_trial.cc |
| +++ b/components/content_settings/core/browser/plugins_field_trial.cc |
| @@ -11,7 +11,8 @@ |
| namespace content_settings { |
| // static |
| -const char PluginsFieldTrial::kFieldTrialName[] = "ForcePluginPowerSaver"; |
| +const char PluginsFieldTrial::kEnableFieldTrial[] = "PluginPowerSaver"; |
|
tommycli
2015/04/28 21:57:56
Add a TODO to remove the redundant one when we're
Dan Beam
2015/04/28 22:17:55
Done. (in the header)
|
| +const char PluginsFieldTrial::kForceFieldTrial[] = "ForcePluginPowerSaver"; |
| // static |
| ContentSetting PluginsFieldTrial::EffectiveContentSetting( |
| @@ -35,8 +36,15 @@ bool PluginsFieldTrial::IsPluginPowerSaverEnabled() { |
| if (cl->HasSwitch(plugins::switches::kEnablePluginPowerSaver)) |
| return true; |
| - std::string group_name = base::FieldTrialList::FindFullName(kFieldTrialName); |
| - return !group_name.empty() && group_name != "Disabled"; |
| + std::string group = base::FieldTrialList::FindFullName(kEnableFieldTrial); |
| + if (!group.empty() && group != "Disabled") |
| + return true; |
| + |
| + group = base::FieldTrialList::FindFullName(kForceFieldTrial); |
| + if (!group.empty() && group != "Disabled") |
| + return true; |
| + |
| + return false; |
| } |
| // static |