Support Using ScopedFeatureList in BrowserTest

base/test/test_suite.cc

 // 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.
 
 #include "base/test/test_suite.h"
 
 #include <memory>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 117 matching lines @@
 }
 
 }  // namespace
 
 int RunUnitTestsUsingBaseTestSuite(int argc, char **argv) {
   TestSuite test_suite(argc, argv);
   return LaunchUnitTests(argc, argv,
                          Bind(&TestSuite::Run, Unretained(&test_suite)));
 }
 
-TestSuite::TestSuite(int argc, char** argv)
-    : initialized_command_line_(false), created_feature_list_(false) {
+TestSuite::TestSuite(int argc, char** argv) : initialized_command_line_(false) {
   PreInitialize();
   InitializeFromCommandLine(argc, argv);
   // Logging must be initialized before any thread has a chance to call logging
   // functions.
   InitializeLogging();
 }
 
 #if defined(OS_WIN)
 TestSuite::TestSuite(int argc, wchar_t** argv)
-    : initialized_command_line_(false), created_feature_list_(false) {
+    : initialized_command_line_(false) {
   PreInitialize();
   InitializeFromCommandLine(argc, argv);
   // Logging must be initialized before any thread has a chance to call logging
   // functions.
   InitializeLogging();
 }
 #endif  // defined(OS_WIN)
 
 TestSuite::~TestSuite() {
   if (initialized_command_line_)
@@ skipping 175 matching lines @@
 #endif  // defined(_DEBUG) && defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 1)
 #endif  // defined(OS_WIN)
 }
 
 void TestSuite::Initialize() {
 #if !defined(OS_IOS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWaitForDebugger)) {
     debug::WaitForDebugger(60, true);
   }
 #endif
-
   // Set up a FeatureList instance, so that code using that API will not hit a
-  // an error that it's not set. If a FeatureList was created in this way (i.e.
-  // one didn't exist previously), it will be cleared in Shutdown() via
-  // ClearInstanceForTesting().
-  created_feature_list_ =
-      FeatureList::InitializeInstance(std::string(), std::string());
+  // an error that it's not set. It will be cleared automatically.
+  // TODO(chaopeng) Should load the actually features in command line here.
+  scoped_feature_list_.InitFromCommandLine(std::string(), std::string());
 
 #if defined(OS_IOS)
   InitIOSTestMessageLoop();
 #endif  // OS_IOS
 
 #if defined(OS_ANDROID)
   InitAndroidTestMessageLoop();
 #endif  // else defined(OS_ANDROID)
 
   CHECK(debug::EnableInProcessStackDumping());
@@ skipping 43 matching lines @@
 
   TestTimeouts::Initialize();
 
   trace_to_file_.BeginTracingFromCommandLineOptions();
 
   base::debug::StartProfiling(GetProfileName());
 }
 
 void TestSuite::Shutdown() {
   base::debug::StopProfiling();
-
-  // Clear the FeatureList that was created by Initialize().
-  if (created_feature_list_)
-    FeatureList::ClearInstanceForTesting();
 }
 
 }  // namespace base