Support Using ScopedFeatureList in BrowserTest

base/test/test_suite.h

 // Copyright (c) 2012 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_TEST_SUITE_H_
 #define BASE_TEST_TEST_SUITE_H_
 
 // Defines a basic test suite framework for running gtest based tests.  You can
 // instantiate this class in your main function and call its Run method to run
 // any gtest based tests that are linked into your executable.
 
 #include <memory>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/test/trace_to_file.h"
 #include "build/build_config.h"
 
 namespace testing {
 class TestInfo;
 }
 
 namespace base {
 
 class XmlUnitTestResultPrinter;
@@ skipping 53 matching lines @@
   void InitializeFromCommandLine(int argc, wchar_t** argv);
 #endif  // defined(OS_WIN)
 
   // Basic initialization for the test suite happens here.
   void PreInitialize();
 
   test::TraceToFile trace_to_file_;
 
   bool initialized_command_line_;
 
-  bool created_feature_list_;
+  test::ScopedFeatureList scoped_feature_list_;
 
   XmlUnitTestResultPrinter* printer_ = nullptr;
 
   std::unique_ptr<logging::ScopedLogAssertHandler> assert_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSuite);
 };
 
 }  // namespace base
 
 #endif  // BASE_TEST_TEST_SUITE_H_