Migrate more tests to ScopedFeatureList.

chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc

 // Copyright 2016 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 "chrome/browser/metrics/antivirus_metrics_provider_win.h"
 
 #include <vector>
 
 #include "base/bind.h"
-#include "base/feature_list.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/histogram_tester.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/version.h"
 #include "base/win/windows_version.h"
 #include "components/variations/metrics_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-// Helper function to toggle whether the ReportFullAVProductDetails feature is
-// enabled or not.
-void SetFullNamesFeatureEnabled(bool enabled) {
-  base::FeatureList::ClearInstanceForTesting();
-  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-  if (enabled) {
-    feature_list->InitializeFromCommandLine(
-        AntiVirusMetricsProvider::kReportNamesFeature.name, std::string());
-  } else {
-    feature_list->InitializeFromCommandLine(
-        std::string(), AntiVirusMetricsProvider::kReportNamesFeature.name);
-  }
-  base::FeatureList::SetInstance(std::move(feature_list));
-}
-
 void VerifySystemProfileData(const metrics::SystemProfileProto& system_profile,
                              bool expect_unhashed_value) {
   const char kWindowsDefender[] = "Windows Defender";
 
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     bool defender_found = false;
     for (const auto& av : system_profile.antivirus_product()) {
       if (av.product_name_hash() == metrics::HashName(kWindowsDefender)) {
         defender_found = true;
         if (expect_unhashed_value) {
@@ skipping 36 matching lines @@
 
     VerifySystemProfileData(system_profile, expect_unhashed_value_);
     // This looks weird, but it's to make sure that reading the data out of the
     // AntiVirusMetricsProvider does not invalidate it, as the class should be
     // resilient to this.
     system_profile.Clear();
     provider_->ProvideSystemProfileMetrics(&system_profile);
     VerifySystemProfileData(system_profile, expect_unhashed_value_);
   }
 
+  // Helper function to toggle whether the ReportFullAVProductDetails feature is
+  // enabled or not.
+  void SetFullNamesFeatureEnabled(bool enabled) {
+    if (enabled) {
+      scoped_feature_list_.InitAndEnableFeature(
+          AntiVirusMetricsProvider::kReportNamesFeature);
+    } else {
+      scoped_feature_list_.InitAndDisableFeature(
+          AntiVirusMetricsProvider::kReportNamesFeature);
+    }
+  }
+
   bool got_results_;
   bool expect_unhashed_value_;
   std::unique_ptr<AntiVirusMetricsProvider> provider_;
   content::TestBrowserThreadBundle thread_bundle_;
+  base::test::ScopedFeatureList scoped_feature_list_;
   base::RunLoop run_loop_;
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<AntiVirusMetricsProviderTest> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AntiVirusMetricsProviderTest);
 };
 
 TEST_P(AntiVirusMetricsProviderTest, GetMetricsFullName) {
   ASSERT_TRUE(thread_checker_.CalledOnValidThread());
@@ skipping 12 matching lines @@
   AntiVirusMetricsProvider::ResultCode expected_result =
       AntiVirusMetricsProvider::RESULT_SUCCESS;
   if (base::win::OSInfo::GetInstance()->version_type() ==
       base::win::SUITE_SERVER)
     expected_result = AntiVirusMetricsProvider::RESULT_WSC_NOT_AVAILABLE;
   histograms.ExpectUniqueSample("UMA.AntiVirusMetricsProvider.Result",
                                 expected_result, 1);
 }
 
 INSTANTIATE_TEST_CASE_P(, AntiVirusMetricsProviderTest, ::testing::Bool());