Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(827)

Unified Diff: content/browser/gpu/gpu_process_host.cc

Issue 2365273004: Initial implementation for sharing field trial state (win) (Closed)
Patch Set: add missing include Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 007039dd7524793fa49529bb69850f09b645e6c6..b213828b6d8efb888f2e143e97e6d5eb038704ad 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"
Alexei Svitkine (slow) 2016/10/06 21:39:28 Nit: Remove.
lawrencewu 2016/10/07 15:07:21 Done.
#include "content/public/common/content_switches.h"
#include "content/public/common/mojo_channel_switches.h"
#include "content/public/common/mojo_shell_connection.h"
@@ -970,8 +971,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);
@@ -1015,10 +1019,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",

Powered by Google App Engine
This is Rietveld 408576698