| Index: content/browser/gpu/gpu_process_host.cc
|
| diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
|
| index 367a69d9323fd065203a78416690ba86d09ad846..d2cfa29bdd16736ad42194c516f4eb0151bead33 100644
|
| --- a/content/browser/gpu/gpu_process_host.cc
|
| +++ b/content/browser/gpu/gpu_process_host.cc
|
| @@ -48,6 +48,7 @@
|
| #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
|
| #include "content/public/common/connection_filter.h"
|
| #include "content/public/common/content_client.h"
|
| +#include "content/public/common/content_features.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/mojo_channel_switches.h"
|
| #include "content/public/common/mojo_shell_connection.h"
|
| @@ -973,8 +974,11 @@ bool GpuProcessHost::LaunchGpuProcess(gpu::GpuPreferences* gpu_preferences) {
|
|
|
| base::CommandLine* cmd_line = new base::CommandLine(exe_path);
|
| #endif
|
| +
|
| cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kGpuProcess);
|
| - BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(cmd_line);
|
| +
|
| + field_trial_state_ =
|
| + BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(cmd_line);
|
|
|
| #if defined(OS_WIN)
|
| cmd_line->AppendArg(switches::kPrefetchArgumentGpu);
|
| @@ -1018,10 +1022,8 @@ bool GpuProcessHost::LaunchGpuProcess(gpu::GpuPreferences* gpu_preferences) {
|
| cmd_line->PrependWrapper(gpu_launcher);
|
|
|
| process_->Launch(
|
| - new GpuSandboxedProcessLauncherDelegate(cmd_line,
|
| - process_->GetHost()),
|
| - cmd_line,
|
| - true);
|
| + new GpuSandboxedProcessLauncherDelegate(cmd_line, process_->GetHost()),
|
| + cmd_line, field_trial_state_.get(), true);
|
| process_launched_ = true;
|
|
|
| UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents",
|
|
|