OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/feature_list.h" | 5 #include "base/feature_list.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 ClearFeatureListInstance(); | 325 ClearFeatureListInstance(); |
326 FieldTrialList field_trial_list(nullptr); | 326 FieldTrialList field_trial_list(nullptr); |
327 scoped_ptr<FeatureList> feature_list(new FeatureList); | 327 scoped_ptr<FeatureList> feature_list(new FeatureList); |
328 feature_list->InitializeFromCommandLine("A,X", "D"); | 328 feature_list->InitializeFromCommandLine("A,X", "D"); |
329 | 329 |
330 FieldTrial* trial = FieldTrialList::CreateFieldTrial("Trial", "Group"); | 330 FieldTrial* trial = FieldTrialList::CreateFieldTrial("Trial", "Group"); |
331 feature_list->RegisterFieldTrialOverride(kFeatureOffByDefaultName, | 331 feature_list->RegisterFieldTrialOverride(kFeatureOffByDefaultName, |
332 FeatureList::OVERRIDE_ENABLE_FEATURE, | 332 FeatureList::OVERRIDE_ENABLE_FEATURE, |
333 trial); | 333 trial); |
334 | 334 |
335 RegisterFeatureListInstance(feature_list.Pass()); | 335 RegisterFeatureListInstance(std::move(feature_list)); |
336 | 336 |
337 std::string enable_features; | 337 std::string enable_features; |
338 std::string disable_features; | 338 std::string disable_features; |
339 FeatureList::GetInstance()->GetFeatureOverrides(&enable_features, | 339 FeatureList::GetInstance()->GetFeatureOverrides(&enable_features, |
340 &disable_features); | 340 &disable_features); |
341 EXPECT_EQ("A,OffByDefault<Trial,X", SortFeatureListString(enable_features)); | 341 EXPECT_EQ("A,OffByDefault<Trial,X", SortFeatureListString(enable_features)); |
342 EXPECT_EQ("D", SortFeatureListString(disable_features)); | 342 EXPECT_EQ("D", SortFeatureListString(disable_features)); |
343 } | 343 } |
344 | 344 |
345 TEST_F(FeatureListTest, InitializeFromCommandLine_WithFieldTrials) { | 345 TEST_F(FeatureListTest, InitializeFromCommandLine_WithFieldTrials) { |
346 ClearFeatureListInstance(); | 346 ClearFeatureListInstance(); |
347 FieldTrialList field_trial_list(nullptr); | 347 FieldTrialList field_trial_list(nullptr); |
348 FieldTrialList::CreateFieldTrial("Trial", "Group"); | 348 FieldTrialList::CreateFieldTrial("Trial", "Group"); |
349 scoped_ptr<FeatureList> feature_list(new FeatureList); | 349 scoped_ptr<FeatureList> feature_list(new FeatureList); |
350 feature_list->InitializeFromCommandLine("A,OffByDefault<Trial,X", "D"); | 350 feature_list->InitializeFromCommandLine("A,OffByDefault<Trial,X", "D"); |
351 RegisterFeatureListInstance(feature_list.Pass()); | 351 RegisterFeatureListInstance(std::move(feature_list)); |
352 | 352 |
353 EXPECT_FALSE(FieldTrialList::IsTrialActive("Trial")); | 353 EXPECT_FALSE(FieldTrialList::IsTrialActive("Trial")); |
354 EXPECT_TRUE(FeatureList::IsEnabled(kFeatureOffByDefault)); | 354 EXPECT_TRUE(FeatureList::IsEnabled(kFeatureOffByDefault)); |
355 EXPECT_TRUE(FieldTrialList::IsTrialActive("Trial")); | 355 EXPECT_TRUE(FieldTrialList::IsTrialActive("Trial")); |
356 } | 356 } |
357 | 357 |
358 } // namespace base | 358 } // namespace base |
OLD | NEW |