| Index: content/browser/browser_child_process_host_impl.h
|
| diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h
|
| index c10b9adf263f99ebfc636e46b9bd2097688e32f4..c88ec6efdaaeedac357d2d3b4ff547981aad193b 100644
|
| --- a/content/browser/browser_child_process_host_impl.h
|
| +++ b/content/browser/browser_child_process_host_impl.h
|
| @@ -12,6 +12,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/memory/shared_memory.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/process/process.h"
|
| #include "base/single_thread_task_runner.h"
|
| @@ -65,12 +66,14 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
|
| // Copies kEnableFeatures and kDisableFeatures to the command line. Generates
|
| // them from the FeatureList override state, to take into account overrides
|
| // from FieldTrials.
|
| - static void CopyFeatureAndFieldTrialFlags(base::CommandLine* cmd_line);
|
| + static std::unique_ptr<base::SharedMemory> CopyFeatureAndFieldTrialFlags(
|
| + base::CommandLine* cmd_line);
|
|
|
| // BrowserChildProcessHost implementation:
|
| bool Send(IPC::Message* message) override;
|
| void Launch(SandboxedProcessLauncherDelegate* delegate,
|
| base::CommandLine* cmd_line,
|
| + const base::SharedMemory* field_trial_state,
|
| bool terminate_on_shutdown) override;
|
| const ChildProcessData& GetData() const override;
|
| ChildProcessHost* GetHost() const override;
|
|
|