Remove modality of MULTI_VALUE choice types in AboutFlags
Previously the UI for multivalues in AboutFlags was confusing, since
you could "enable" or "disable" the feature, then select an option
from a combobox. This change removes this modality, and instead, the
first option from the multivalue should be considered the "disabled"
version of the lab (we even assert that it has no command line flags).
This CL was originally http://codereview.chromium.org/6410082/ , but
cbentzel suggested we split it up into two CLs: this is the first of
them.
BUG=none
TEST=AboutFlagsTest.MultiValues
Review URL: http://codereview.chromium.org/6413037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74277 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index c3bbe95b..f5c7242 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -26,6 +26,7 @@
namespace about_flags {
const Experiment::Choice kMultiChoices[] = {
+ { IDS_PRODUCT_NAME, "" },
{ IDS_PRODUCT_NAME, kMultiSwitch1 },
{ IDS_PRODUCT_NAME, kMultiSwitch2 },
};
@@ -222,22 +223,21 @@
EXPECT_EQ(arraysize(kExperiments) - 1, switch_prefs->GetSize());
}
-// Tests enabling multi-value type experiments.
+// Tests multi-value type experiments.
TEST_F(AboutFlagsTest, MultiValues) {
- // Enable the multi value experiment, which should enable the first choice.
- SetExperimentEnabled(&prefs_, kFlags4, true);
+ // Initially, the first "deactivated" option of the multi experiment should
+ // be set.
{
CommandLine command_line(CommandLine::NO_PROGRAM);
ConvertFlagsToSwitches(&prefs_, &command_line);
- EXPECT_TRUE(command_line.HasSwitch(kMultiSwitch1));
+ EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
}
- // Enable the 2nd choice of the multi-value, which should disable the first
- // choice.
+ // Enable the 2nd choice of the multi-value.
SetExperimentEnabled(&prefs_, std::string(kFlags4) +
std::string(testing::kMultiSeparator) +
- base::IntToString(1), true);
+ base::IntToString(2), true);
{
CommandLine command_line(CommandLine::NO_PROGRAM);
ConvertFlagsToSwitches(&prefs_, &command_line);
@@ -246,7 +246,9 @@
}
// Disable the multi-value experiment.
- SetExperimentEnabled(&prefs_, kFlags4, false);
+ SetExperimentEnabled(&prefs_, std::string(kFlags4) +
+ std::string(testing::kMultiSeparator) +
+ base::IntToString(0), true);
{
CommandLine command_line(CommandLine::NO_PROGRAM);
ConvertFlagsToSwitches(&prefs_, &command_line);
