Revert of Have each SandboxedProcessLauncherDelegate maintain a zygote.

content/browser/child_process_launcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_
 #define CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_
 
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/threading/non_thread_safe.h"
 #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
 // on the OS since often it can take > 100 ms to create the process.
 class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe {
  public:
   class CONTENT_EXPORT Client {
    public:
     // Will be called on the thread that the ChildProcessLauncher was
     // constructed on.
@@ skipping 53 matching lines @@
               int child_process_id);
 
   void UpdateTerminationStatus(bool known_dead);
 
   // This is always called on the client thread after an attempt
   // to launch the child process on the launcher thread.
   // It makes sure we always perform the necessary cleanup if the
   // 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
               base::Process process);
 
 #if defined(MOJO_SHELL_CLIENT)
   // When this process is run from an external Mojo shell, this function will
   // create a channel and pass one end to the spawned process and register the
   // other end with the external shell, allowing the spawned process to bind an
   // Application request from the shell.
   void CreateMojoShellChannel(base::CommandLine* command_line,
                               int child_process_id);
 #endif
 
   Client* client_;
   BrowserThread::ID client_thread_id_;
   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.
   const bool terminate_child_on_shutdown_;
 
   base::WeakPtrFactory<ChildProcessLauncher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessLauncher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_