Migrate more tests to ScopedFeatureList.

components/variations/field_trial_config/field_trial_util_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/variations/field_trial_config/field_trial_util.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
-#include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
+#include "base/test/scoped_feature_list.h"
 #include "components/variations/field_trial_config/fieldtrial_testing_config.h"
 #include "components/variations/variations_associated_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace variations {
 
 namespace {
 
 class FieldTrialUtilTest : public ::testing::Test {
  public:
@@ skipping 96 matching lines @@
 
   const FieldTrialTestingStudy array_kFieldTrialConfig_studies[] = {
       {"TestTrial1", array_kFieldTrialConfig_experiments_0, 1},
       {"TestTrial2", array_kFieldTrialConfig_experiments_1, 2},
   };
 
   const FieldTrialTestingConfig kConfig = {
       array_kFieldTrialConfig_studies, 2
   };
 
-  base::FeatureList::ClearInstanceForTesting();
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
   AssociateParamsFromFieldTrialConfig(kConfig, feature_list.get());
-  base::FeatureList::SetInstance(std::move(feature_list));
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitWithFeatureList(std::move(feature_list));
 
   // Check the resulting feature and field trial states. Trials should not be
   // active until their associated features are queried.
   EXPECT_FALSE(base::FieldTrialList::IsTrialActive("TestTrial1"));
   EXPECT_TRUE(base::FeatureList::IsEnabled(kFeatureA));
   EXPECT_TRUE(base::FeatureList::IsEnabled(kFeatureB));
   EXPECT_TRUE(base::FieldTrialList::IsTrialActive("TestTrial1"));
 
   EXPECT_FALSE(base::FieldTrialList::IsTrialActive("TestTrial2"));
   EXPECT_FALSE(base::FeatureList::IsEnabled(kFeatureC));
@@ skipping 28 matching lines @@
 
   base::FeatureList feature_list;
   AssociateParamsFromFieldTrialConfig(kConfig, &feature_list);
 
   EXPECT_EQ("TestGroup1", base::FieldTrialList::FindFullName("TestTrial1"));
   EXPECT_EQ("ForcedGroup2", base::FieldTrialList::FindFullName("TestTrial2"));
   EXPECT_EQ("ForcedGroup3", base::FieldTrialList::FindFullName("TestTrial3"));
 }
 
 }  // namespace variations