Add a field trial to enable plugin power saver for all users.

components/content_settings/core/browser/plugins_field_trial_unittest.cc

Index: components/content_settings/core/browser/plugins_field_trial_unittest.cc
diff --git a/components/content_settings/core/browser/plugins_field_trial_unittest.cc b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
index 052f8a5b39cd0290c2c6b9703a267cd6baa72c33..7ea12b04897b8835c7bce7b00b9f4f01a450fe65 100644
--- a/components/content_settings/core/browser/plugins_field_trial_unittest.cc
+++ b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
@@ -19,11 +19,12 @@ namespace content_settings {
 
 namespace {
 
-const auto& kFieldTrialName = PluginsFieldTrial::kFieldTrialName;
+const auto& kEnableFieldTrial = PluginsFieldTrial::kEnableFieldTrial;
+const auto& kForceFieldTrial = PluginsFieldTrial::kForceFieldTrial;
 
-void ForceFieldTrialGroup(const std::string& group_name) {
+void SetForceFieldTrialGroup(const std::string& group) {

[tommycli, 2015/04/28 21:57:56]

It's a shame that the test has been weakened by adding another Field trial name.

But testing all 4 combinations of these two field trials is also lame. Is there
a way out of this?

[Dan Beam, 2015/04/28 22:17:55]

Done. (minimal lameness achieved?)

   using base::FieldTrialList;
-  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kFieldTrialName, group_name));
+  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kForceFieldTrial, group));
 }
 
 }  // namespace
@@ -42,17 +43,18 @@ TEST_F(PluginsFieldTrialTest, DisabledByDefault) {
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   ASSERT_FALSE(cl->HasSwitch(plugins::switches::kDisablePluginPowerSaver));
   ASSERT_FALSE(cl->HasSwitch(plugins::switches::kEnablePluginPowerSaver));
-  ASSERT_FALSE(base::FieldTrialList::TrialExists(kFieldTrialName));
+  ASSERT_FALSE(base::FieldTrialList::TrialExists(kEnableFieldTrial));
+  ASSERT_FALSE(base::FieldTrialList::TrialExists(kForceFieldTrial));
   EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, FieldTrialEnabled) {
-  ForceFieldTrialGroup("Enabled");
+  SetForceFieldTrialGroup("Dogfood");
   EXPECT_TRUE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, FieldTrialDisabled) {
-  ForceFieldTrialGroup("Disabled");
+  SetForceFieldTrialGroup("Disabled");
   EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
@@ -69,21 +71,21 @@ TEST_F(PluginsFieldTrialTest, SwitchDisabled) {
 }
 
 TEST_F(PluginsFieldTrialTest, SwitchOverridesFieldTrial1) {
-  ForceFieldTrialGroup("Disabled");
+  SetForceFieldTrialGroup("Disabled");
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(plugins::switches::kEnablePluginPowerSaver);
   EXPECT_TRUE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, SwitchOverridesFieldTrial2) {
-  ForceFieldTrialGroup("Enabled");
+  SetForceFieldTrialGroup("Dogfood");
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(plugins::switches::kDisablePluginPowerSaver);
   EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, NoPrefLeftBehind) {
-  ForceFieldTrialGroup("Enabled");
+  SetForceFieldTrialGroup("Dogfood");
   user_prefs::TestingPrefServiceSyncable prefs;
   {
     DefaultProvider::RegisterProfilePrefs(prefs.registry());