Change ScopedFeatureList to overrides FeatureList not reset

base/test/scoped_feature_list.h

 // 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.
 
 #ifndef BASE_TEST_SCOPED_FEATURE_LIST_H_
 #define BASE_TEST_SCOPED_FEATURE_LIST_H_
 
 #include <initializer_list>
 
 #include "base/feature_list.h"
@@ skipping 29 matching lines @@
                            const std::string& disable_features);
 
   // Initializes and registers a FeatureList instance enabling a single
   // feature.
   void InitAndEnableFeature(const base::Feature& feature);
 
   // Initializes and registers a FeatureList instance disabling a single
   // feature.
   void InitAndDisableFeature(const base::Feature& feature);
 
+  // Initializes and registers a FeatureList instance with
+  // override_enabled_features and override_disabled_features overrides
+  // current feature_list.
+  void InitWithFeatureListAndOverrides(
+      const std::vector<std::string>& override_enabled_features,
+      const std::vector<std::string>& override_disabled_features);
+
  private:
   std::unique_ptr<FeatureList> original_feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedFeatureList);
 };
 
 }  // namespace test
 }  // namespace base
 
 #endif  // BASE_TEST_SCOPED_FEATURE_LIST_H_