Add a ScopedFeatureList class for testing and start using it.

components/password_manager/core/browser/password_form_manager_unittest.cc

Index: components/password_manager/core/browser/password_form_manager_unittest.cc
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index b294ad38ca682431fa2fede85b230a75e3c20295..133f3ea7b947a530fcf3f25ad38c5ee517970498 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -14,6 +14,7 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
+#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/proto/server.pb.h"
@@ -768,13 +769,11 @@ class PasswordFormManagerFillOnAccountSelectTest
   PasswordFormManagerFillOnAccountSelectTest() {}
 
   void SetUp() override {
-    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-    std::vector<const base::Feature*> enabled_features;
-    std::vector<const base::Feature*> disabled_features;
-    enabled_features.push_back(&features::kFillOnAccountSelect);
-    SetFeatures(enabled_features, disabled_features, std::move(feature_list));
+    scoped_feature_list_.InitAndEnableFeature(features::kFillOnAccountSelect);

[Ilya Sherman, 2016/08/09 01:06:57]

nit: Would be better to do this in the constructor, and remove the SetUp()
method.

[Alexei Svitkine (slow), 2016/08/09 01:26:16]

Done.

     PasswordFormManagerTest::SetUp();
   }
+
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 TEST_F(PasswordFormManagerTest, TestNewLogin) {