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..31ef8e2cbbbd686b1170d28e4883ebd54ecf542c 100644
--- a/components/content_settings/core/browser/plugins_field_trial_unittest.cc
+++ b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
@@ -15,18 +15,12 @@
 #include "components/pref_registry/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace content_settings {
-
-namespace {
-
-const auto& kFieldTrialName = PluginsFieldTrial::kFieldTrialName;
+using base::FieldTrialList;
 
-void ForceFieldTrialGroup(const std::string& group_name) {
-  using base::FieldTrialList;
-  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kFieldTrialName, group_name));
-}
+namespace content_settings {
 
-}  // namespace
+const auto& kEnableFieldTrial = PluginsFieldTrial::kEnableFieldTrial;

[Bernhard Bauer, 2015/04/29 16:23:24]

This is const char*, right? Could you just use that, as it's not longer than
const auto&?

[Dan Beam, 2015/04/29 17:59:28]

Done. (this is just want clang told me to do, btw)

+const auto& kForceFieldTrial = PluginsFieldTrial::kForceFieldTrial;
 
 class PluginsFieldTrialTest : public testing::Test {
  public:
@@ -42,48 +36,49 @@ 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");
+TEST_F(PluginsFieldTrialTest, EnabledByFieldTrial) {
+  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kForceFieldTrial, "Dogfood"));
   EXPECT_TRUE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
-TEST_F(PluginsFieldTrialTest, FieldTrialDisabled) {
-  ForceFieldTrialGroup("Disabled");
+TEST_F(PluginsFieldTrialTest, DisabledByFieldTrial) {
+  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kEnableFieldTrial, "Disabled"));
   EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
-TEST_F(PluginsFieldTrialTest, SwitchEnabled) {
+TEST_F(PluginsFieldTrialTest, EnabledBySwitch) {
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(plugins::switches::kEnablePluginPowerSaver);
   EXPECT_TRUE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
-TEST_F(PluginsFieldTrialTest, SwitchDisabled) {
+TEST_F(PluginsFieldTrialTest, DisabledBySwitch) {
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(plugins::switches::kDisablePluginPowerSaver);
   EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, SwitchOverridesFieldTrial1) {
-  ForceFieldTrialGroup("Disabled");
+  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kForceFieldTrial, "Disabled"));
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(plugins::switches::kEnablePluginPowerSaver);
   EXPECT_TRUE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, SwitchOverridesFieldTrial2) {
-  ForceFieldTrialGroup("Enabled");
+  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kEnableFieldTrial, "Enabled"));
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(plugins::switches::kDisablePluginPowerSaver);
   EXPECT_FALSE(PluginsFieldTrial::IsPluginPowerSaverEnabled());
 }
 
 TEST_F(PluginsFieldTrialTest, NoPrefLeftBehind) {
-  ForceFieldTrialGroup("Enabled");
+  ASSERT_TRUE(FieldTrialList::CreateFieldTrial(kEnableFieldTrial, "Enabled"));
   user_prefs::TestingPrefServiceSyncable prefs;
   {
     DefaultProvider::RegisterProfilePrefs(prefs.registry());