OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base_switches.h" | 5 #include "base/base_switches.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/debug/debugger.h" | 7 #include "base/debug/debugger.h" |
8 #include "base/debug/stack_trace.h" | 8 #include "base/debug/stack_trace.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
186 // Initialize statistical testing infrastructure. We set the entropy provider | 186 // Initialize statistical testing infrastructure. We set the entropy provider |
187 // to NULL to disallow the renderer process from creating its own one-time | 187 // to NULL to disallow the renderer process from creating its own one-time |
188 // randomized trials; they should be created in the browser process. | 188 // randomized trials; they should be created in the browser process. |
189 base::FieldTrialList field_trial_list(NULL); | 189 base::FieldTrialList field_trial_list(NULL); |
190 // Ensure any field trials in browser are reflected into renderer. | 190 // Ensure any field trials in browser are reflected into renderer. |
191 if (parsed_command_line.HasSwitch(switches::kForceFieldTrials)) { | 191 if (parsed_command_line.HasSwitch(switches::kForceFieldTrials)) { |
192 // Field trials are created in an "activated" state to ensure they get | 192 // Field trials are created in an "activated" state to ensure they get |
193 // reported in crash reports. | 193 // reported in crash reports. |
194 bool result = base::FieldTrialList::CreateTrialsFromString( | 194 bool result = base::FieldTrialList::CreateTrialsFromString( |
195 parsed_command_line.GetSwitchValueASCII(switches::kForceFieldTrials), | 195 parsed_command_line.GetSwitchValueASCII(switches::kForceFieldTrials), |
196 base::FieldTrialList::ACTIVATE_TRIALS); | 196 base::FieldTrialList::ACTIVATE_TRIALS, std::set<std::string>()); |
jamesr
2014/02/13 01:06:30
new parameter, new line
gab
2014/02/13 02:49:03
Done.
| |
197 DCHECK(result); | 197 DCHECK(result); |
198 } | 198 } |
199 | 199 |
200 #if defined(ENABLE_PLUGINS) | 200 #if defined(ENABLE_PLUGINS) |
201 // Load pepper plugins before engaging the sandbox. | 201 // Load pepper plugins before engaging the sandbox. |
202 PepperPluginRegistry::GetInstance(); | 202 PepperPluginRegistry::GetInstance(); |
203 #endif | 203 #endif |
204 #if defined(ENABLE_WEBRTC) | 204 #if defined(ENABLE_WEBRTC) |
205 // Initialize WebRTC before engaging the sandbox. | 205 // Initialize WebRTC before engaging the sandbox. |
206 // NOTE: On linux, this call could already have been made from | 206 // NOTE: On linux, this call could already have been made from |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
248 base::MessageLoop::current()->Run(); | 248 base::MessageLoop::current()->Run(); |
249 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); | 249 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); |
250 } | 250 } |
251 } | 251 } |
252 platform.PlatformUninitialize(); | 252 platform.PlatformUninitialize(); |
253 TRACE_EVENT_END_ETW("RendererMain", 0, ""); | 253 TRACE_EVENT_END_ETW("RendererMain", 0, ""); |
254 return 0; | 254 return 0; |
255 } | 255 } |
256 | 256 |
257 } // namespace content | 257 } // namespace content |
OLD | NEW |