summaryrefslogtreecommitdiffstats
path: root/base/feature_list_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'base/feature_list_unittest.cc')
-rw-r--r--base/feature_list_unittest.cc15
1 files changed, 14 insertions, 1 deletions
diff --git a/base/feature_list_unittest.cc b/base/feature_list_unittest.cc
index 414c74a..29c1f16 100644
--- a/base/feature_list_unittest.cc
+++ b/base/feature_list_unittest.cc
@@ -335,8 +335,21 @@ TEST_F(FeatureListTest, GetFeatureOverrides) {
std::string disable_features;
FeatureList::GetInstance()->GetFeatureOverrides(&enable_features,
&disable_features);
- EXPECT_EQ("A,OffByDefault,X", SortFeatureListString(enable_features));
+ EXPECT_EQ("A,OffByDefault<Trial,X", SortFeatureListString(enable_features));
EXPECT_EQ("D", SortFeatureListString(disable_features));
}
+TEST_F(FeatureListTest, InitializeFromCommandLine_WithFieldTrials) {
+ ClearFeatureListInstance();
+ FieldTrialList field_trial_list(nullptr);
+ FieldTrialList::CreateFieldTrial("Trial", "Group");
+ scoped_ptr<FeatureList> feature_list(new FeatureList);
+ feature_list->InitializeFromCommandLine("A,OffByDefault<Trial,X", "D");
+ RegisterFeatureListInstance(feature_list.Pass());
+
+ EXPECT_FALSE(FieldTrialList::IsTrialActive("Trial"));
+ EXPECT_TRUE(FeatureList::IsEnabled(kFeatureOffByDefault));
+ EXPECT_TRUE(FieldTrialList::IsTrialActive("Trial"));
+}
+
} // namespace base