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

content/utility/utility_main.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/debug/leak_annotations.h"
+#include "base/feature_list.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "base/timer/hi_res_timer_manager.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
 #include "content/common/sandbox_linux/sandbox_linux.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/utility/utility_thread_impl.h"
@@ skipping 12 matching lines @@
   base::PlatformThread::SetName("CrUtilityMain");
 
 #if defined(OS_LINUX)
   // Initializes the sandbox before any threads are created.
   // TODO(jorgelo): move this after GTK initialization when we enable a strict
   // Seccomp-BPF policy.
   if (parameters.zygote_child)
     LinuxSandbox::InitializeSandbox();
 #endif
 
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      parameters.command_line.GetSwitchValueASCII(switches::kEnableFeatures),
+      parameters.command_line.GetSwitchValueASCII(switches::kDisableFeatures));
+  base::FeatureList::SetInstance(std::move(feature_list));
+
   ChildProcess utility_process;
   utility_process.set_main_thread(new UtilityThreadImpl());
 
   base::HighResolutionTimerManager hi_res_timer_manager;
 
 #if defined(OS_WIN)
   bool no_sandbox = parameters.command_line.HasSwitch(switches::kNoSandbox);
   if (!no_sandbox) {
     sandbox::TargetServices* target_services =
         parameters.sandbox_info->target_services;
@@ skipping 12 matching lines @@
 #if defined(LEAK_SANITIZER)
   // Invoke LeakSanitizer before shutting down the utility thread, to avoid
   // reporting shutdown-only leaks.
   __lsan_do_leak_check();
 #endif
 
   return 0;
 }
 
 }  // namespace content