| Index: content/browser/child_process_launcher.h
|
| diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h
|
| index 9233f43c5b5a88161d30be8b6b56c422625ffd23..c4f63210af106d6db198f67d79aae355b7138d36 100644
|
| --- a/content/browser/child_process_launcher.h
|
| +++ b/content/browser/child_process_launcher.h
|
| @@ -15,13 +15,13 @@
|
| #include "build/build_config.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/common/sandboxed_process_launcher_delegate.h"
|
|
|
| namespace base {
|
| class CommandLine;
|
| }
|
|
|
| namespace content {
|
| +class SandboxedProcessLauncherDelegate;
|
|
|
| // Launches a process asynchronously and notifies the client of the process
|
| // handle when it's available. It's used to avoid blocking the calling thread
|
| @@ -95,14 +95,14 @@
|
| // client went away.
|
| static void DidLaunch(base::WeakPtr<ChildProcessLauncher> instance,
|
| bool terminate_on_shutdown,
|
| - ZygoteHandle zygote,
|
| + bool zygote,
|
| #if defined(OS_ANDROID)
|
| base::ScopedFD ipcfd,
|
| #endif
|
| base::Process process);
|
|
|
| // Notifies the client about the result of the operation.
|
| - void Notify(ZygoteHandle zygote,
|
| + void Notify(bool zygote,
|
| #if defined(OS_ANDROID)
|
| base::ScopedFD ipcfd,
|
| #endif
|
| @@ -122,7 +122,7 @@
|
| base::Process process_;
|
| base::TerminationStatus termination_status_;
|
| int exit_code_;
|
| - ZygoteHandle zygote_;
|
| + bool zygote_;
|
| bool starting_;
|
| // Controls whether the child process should be terminated on browser
|
| // shutdown. Default behavior is to terminate the child.
|
|
|