Changes to support using base/feature_list.h from gin/.

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 "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 194 matching lines @@
 // Initialize().  See bug 6436.
 int TestSuite::Run() {
 #if defined(OS_IOS)
   RunTestsFromIOSApp();
 #endif
 
 #if defined(OS_MACOSX)
   mac::ScopedNSAutoreleasePool scoped_pool;
 #endif
 
+  // Set up a FeatureList instance, so that code using that API will not hit a

[Paweł Hajdan Jr., 2016/04/04 16:45:17]

While you're here: could you move this code to Initialize/Shutdown?

Consider this optional, especially if that hits any errors or other yak shave.

However, if just moving it works, I'd recommend we do that.

[Alexei Svitkine (slow), 2016/04/04 20:01:55]

Seems to work. Done.

+  // 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 ClearInstanceForTesting() below.
+  const bool created_feature_list =
+      FeatureList::InitializeInstance(std::string(), std::string());
+
   Initialize();
   std::string client_func =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kTestChildProcess);
 
   // Check to see if we are being run as a client process.
   if (!client_func.empty())
     return multi_process_function_list::InvokeChildProcessTest(client_func);
 #if defined(OS_IOS)
   test_listener_ios::RegisterTestEndListener();
 #endif
 
-  // Set up a FeatureList instance, so that code using that API will not hit a
-  // an error that it's not set. Cleared by ClearInstanceForTesting() below.
-  base::FeatureList::SetInstance(make_scoped_ptr(new base::FeatureList));
-
   int result = RUN_ALL_TESTS();
 
   // Clear the FeatureList that was registered above.
-  FeatureList::ClearInstanceForTesting();
+  if (created_feature_list)
+    FeatureList::ClearInstanceForTesting();
 
 #if defined(OS_MACOSX)
   // This MUST happen before Shutdown() since Shutdown() tears down
   // objects (such as NotificationService::current()) that Cocoa
   // objects use to remove themselves as observers.
   scoped_pool.Recycle();
 #endif
 
   Shutdown();
 
@@ skipping 113 matching lines @@
 
   TestTimeouts::Initialize();
 
   trace_to_file_.BeginTracingFromCommandLineOptions();
 }
 
 void TestSuite::Shutdown() {
 }
 
 }  // namespace base