Migrate more tests to ScopedFeatureList.

chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc

Index: chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc
diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc
index ce745007db6e45edcab7fd0fc6ae3882c51b136a..cdcbe70aae1e40add2d127ec46fcb7bf40c0b6b3 100644
--- a/chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc
+++ b/chrome/browser/ui/startup/default_browser_infobar_delegate_unittest.cc
@@ -7,10 +7,10 @@
 #include <memory>
 #include <string>
 
-#include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/infobars/core/infobar.h"
@@ -70,11 +70,7 @@ class DefaultBrowserInfoBarDelegateTest : public ::testing::Test {
 
  protected:
   void EnableStickyDefaultBrowserPrompt() {
-    base::FeatureList::ClearInstanceForTesting();
-    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-    feature_list->InitializeFromCommandLine(kStickyDefaultBrowserPrompt.name,
-                                            std::string());
-    base::FeatureList::SetInstance(std::move(feature_list));
+    scoped_feature_list_.InitAndEnableFeature(kStickyDefaultBrowserPrompt);
   }
 
   void AddDefaultBrowserInfoBar() {
@@ -97,6 +93,8 @@ class DefaultBrowserInfoBarDelegateTest : public ::testing::Test {
   // Manages the default browser prompt.
   InfoBarService* infobar_service_;
 
+  base::test::ScopedFeatureList scoped_feature_list_;
+
   DISALLOW_COPY_AND_ASSIGN(DefaultBrowserInfoBarDelegateTest);
 };