Chromium Code Reviews| Index: content/renderer/renderer_main.cc |
| diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc |
| index d95287ba965472294c765426c8e880370858a76f..a64816a67106e7c3aa0343f1f87951a738d7ec7b 100644 |
| --- a/content/renderer/renderer_main.cc |
| +++ b/content/renderer/renderer_main.cc |
| @@ -178,8 +178,6 @@ int RendererMain(const MainFunctionParams& parameters) { |
| base::PlatformThread::SetName("CrRendererMain"); |
| - platform.PlatformInitialize(); |
| - |
| bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox); |
| // Initialize histogram statistics gathering system. |
| @@ -200,6 +198,9 @@ int RendererMain(const MainFunctionParams& parameters) { |
| DCHECK(result); |
| } |
| + // PlatformInitialize uses FieldTrials, so this must happen later. |
| + platform.PlatformInitialize(); |
|
scottmg
2014/06/17 00:07:16
Needs to be moved so that trials can take effect h
|
| + |
| #if defined(ENABLE_PLUGINS) |
| // Load pepper plugins before engaging the sandbox. |
| PepperPluginRegistry::GetInstance(); |