| Index: base/feature_list_unittest.cc
|
| diff --git a/base/feature_list_unittest.cc b/base/feature_list_unittest.cc
|
| index 9169421da3564284f95380659bf2cc9385ed3870..feea94561bd8c5318349f67add342e224dffdf35 100644
|
| --- a/base/feature_list_unittest.cc
|
| +++ b/base/feature_list_unittest.cc
|
| @@ -333,8 +333,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
|
|
|