OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/debug/leak_annotations.h" | 6 #include "base/debug/leak_annotations.h" |
| 7 #include "base/feature_list.h" |
7 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
8 #include "base/threading/platform_thread.h" | 9 #include "base/threading/platform_thread.h" |
9 #include "base/timer/hi_res_timer_manager.h" | 10 #include "base/timer/hi_res_timer_manager.h" |
10 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "content/child/child_process.h" | 12 #include "content/child/child_process.h" |
12 #include "content/common/sandbox_linux/sandbox_linux.h" | 13 #include "content/common/sandbox_linux/sandbox_linux.h" |
13 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
14 #include "content/public/common/main_function_params.h" | 15 #include "content/public/common/main_function_params.h" |
15 #include "content/public/common/sandbox_init.h" | 16 #include "content/public/common/sandbox_init.h" |
16 #include "content/utility/utility_thread_impl.h" | 17 #include "content/utility/utility_thread_impl.h" |
(...skipping 12 matching lines...) Expand all Loading... |
29 base::PlatformThread::SetName("CrUtilityMain"); | 30 base::PlatformThread::SetName("CrUtilityMain"); |
30 | 31 |
31 #if defined(OS_LINUX) | 32 #if defined(OS_LINUX) |
32 // Initializes the sandbox before any threads are created. | 33 // Initializes the sandbox before any threads are created. |
33 // TODO(jorgelo): move this after GTK initialization when we enable a strict | 34 // TODO(jorgelo): move this after GTK initialization when we enable a strict |
34 // Seccomp-BPF policy. | 35 // Seccomp-BPF policy. |
35 if (parameters.zygote_child) | 36 if (parameters.zygote_child) |
36 LinuxSandbox::InitializeSandbox(); | 37 LinuxSandbox::InitializeSandbox(); |
37 #endif | 38 #endif |
38 | 39 |
| 40 scoped_ptr<base::FeatureList> feature_list(new base::FeatureList); |
| 41 feature_list->InitializeFromCommandLine( |
| 42 parameters.command_line.GetSwitchValueASCII(switches::kEnableFeatures), |
| 43 parameters.command_line.GetSwitchValueASCII(switches::kDisableFeatures)); |
| 44 base::FeatureList::SetInstance(std::move(feature_list)); |
| 45 |
39 ChildProcess utility_process; | 46 ChildProcess utility_process; |
40 utility_process.set_main_thread(new UtilityThreadImpl()); | 47 utility_process.set_main_thread(new UtilityThreadImpl()); |
41 | 48 |
42 base::HighResolutionTimerManager hi_res_timer_manager; | 49 base::HighResolutionTimerManager hi_res_timer_manager; |
43 | 50 |
44 #if defined(OS_WIN) | 51 #if defined(OS_WIN) |
45 bool no_sandbox = parameters.command_line.HasSwitch(switches::kNoSandbox); | 52 bool no_sandbox = parameters.command_line.HasSwitch(switches::kNoSandbox); |
46 if (!no_sandbox) { | 53 if (!no_sandbox) { |
47 sandbox::TargetServices* target_services = | 54 sandbox::TargetServices* target_services = |
48 parameters.sandbox_info->target_services; | 55 parameters.sandbox_info->target_services; |
(...skipping 12 matching lines...) Expand all Loading... |
61 #if defined(LEAK_SANITIZER) | 68 #if defined(LEAK_SANITIZER) |
62 // Invoke LeakSanitizer before shutting down the utility thread, to avoid | 69 // Invoke LeakSanitizer before shutting down the utility thread, to avoid |
63 // reporting shutdown-only leaks. | 70 // reporting shutdown-only leaks. |
64 __lsan_do_leak_check(); | 71 __lsan_do_leak_check(); |
65 #endif | 72 #endif |
66 | 73 |
67 return 0; | 74 return 0; |
68 } | 75 } |
69 | 76 |
70 } // namespace content | 77 } // namespace content |
OLD | NEW |