Moved common parts of ChildProcessHost into chrome/common and created a Brows...

chrome/browser/browser_child_process_host.h

Index: chrome/browser/browser_child_process_host.h
===================================================================
--- chrome/browser/browser_child_process_host.h	(revision 51385)
+++ chrome/browser/browser_child_process_host.h	(working copy)
@@ -2,51 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHILD_PROCESS_HOST_H_
-#define CHROME_BROWSER_CHILD_PROCESS_HOST_H_
+#ifndef CHROME_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
+#define CHROME_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
 
 #include <list>
-#include <string>
 
-// Must be included early (e.g. before chrome/common/plugin_messages.h)
-#include "ipc/ipc_logging.h"
-
-#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
 #include "chrome/browser/child_process_launcher.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "ipc/ipc_channel.h"
+#include "chrome/common/child_process_host.h"
 
-class CommandLine;
-class NotificationType;
 
 // Plugins/workers and other child processes that live on the IO thread should
 // derive from this class.
 //
 // [Browser]RenderProcessHost is the main exception that doesn't derive from
 // this class. That project lives on the UI thread.
-class ChildProcessHost : public ResourceDispatcherHost::Receiver,
-                         public IPC::Channel::Listener,
-                         public ChildProcessLauncher::Client {
+class BrowserChildProcessHost : public ResourceDispatcherHost::Receiver,
+                                public ChildProcessHost,
+                                public ChildProcessLauncher::Client {
  public:
-  virtual ~ChildProcessHost();
+  virtual ~BrowserChildProcessHost();
 
-  // Returns the pathname to be used for a child process.  If a subprocess
-  // pathname was specified on the command line, that will be used.  Otherwise,
-  // the default child process pathname will be returned.  On most platforms,
-  // this will be the same as the currently-executing process.
-  //
-  // The argument allow_self is used on Linux to indicate that we allow us to
-  // fork from /proc/self/exe rather than using the "real" app path. This
-  // prevents autoupdate from confusing us if it changes the file out from
-  // under us. You will generally want to set this to true, except when there
-  // is an override to the command line (for example, we're forking a renderer
-  // in gdb). In this case, you'd use GetChildPath to get the real executable
-  // file name, and then prepend the GDB command to the command line.
-  //
-  // On failure, returns an empty FilePath.
-  static FilePath GetChildPath(bool allow_self);
-
   // Prepares command_line for crash reporting as appropriate.  On Linux and
   // Mac, a command-line flag to enable crash reporting in the child process
   // will be appended if needed, because the child process may not have access
@@ -69,22 +45,22 @@
    public:
     Iterator();
     explicit Iterator(ProcessType type);
-    ChildProcessHost* operator->() { return *iterator_; }
-    ChildProcessHost* operator*() { return *iterator_; }
-    ChildProcessHost* operator++();
+    BrowserChildProcessHost* operator->() { return *iterator_; }
+    BrowserChildProcessHost* operator*() { return *iterator_; }
+    BrowserChildProcessHost* operator++();
     bool Done();
 
    private:
     bool all_;
     ProcessType type_;
-    std::list<ChildProcessHost*>::iterator iterator_;
+    std::list<BrowserChildProcessHost*>::iterator iterator_;
   };
 
  protected:
   // The resource_dispatcher_host may be NULL to indicate none is needed for
   // this process type.
-  ChildProcessHost(ProcessType type,
-                   ResourceDispatcherHost* resource_dispatcher_host);
+  BrowserChildProcessHost(ProcessType type,
+                          ResourceDispatcherHost* resource_dispatcher_host);
 
   // Derived classes call this to launch the child process asynchronously.
   void Launch(
@@ -96,66 +72,38 @@
 #endif
       CommandLine* cmd_line);
 
-  // Derived classes return true if it's ok to shut down the child process.
-  virtual bool CanShutdown() = 0;
-
-  // Send the shutdown message to the child process, and remove this host from
-  // the host list. Does not check if CanShutdown is true.
-  void ForceShutdown();
-
-  // Creates the IPC channel.  Returns true iff it succeeded.
-  bool CreateChannel();
-
-  // Notifies us that an instance has been created on this child process.
-  void InstanceCreated();
-
-  // IPC::Channel::Listener implementation:
-  virtual void OnMessageReceived(const IPC::Message& msg) { }
-  virtual void OnChannelConnected(int32 peer_pid) { }
-  virtual void OnChannelError() { }
-
   // ChildProcessLauncher::Client implementation.
-  virtual void OnProcessLaunched() {}
+  virtual void OnProcessLaunched() { }
 
   // Derived classes can override this to know if the process crashed.
   virtual void OnProcessCrashed() {}
 
-  bool opening_channel() { return opening_channel_; }
-  const std::string& channel_id() { return channel_id_; }
-
   virtual bool DidChildCrash();
 
-  // Called when the child process goes away.
+  // Overrides from ChildProcessHost
   virtual void OnChildDied();
+  virtual bool InterceptMessageFromChild(const IPC::Message& msg);
+  virtual void Notify(NotificationType type);
+  // Extends the base class implementation and removes this host from
+  // the host list. Calls ChildProcessHost::ForceShutdown
+  virtual void ForceShutdown();
 
  private:
-  // Sends the given notification to the notification service on the UI thread.
-  void Notify(NotificationType type);
-
-  // By using an internal class as the IPC::Channel::Listener, we can intercept
-  // OnMessageReceived/OnChannelConnected and do our own processing before
+  // By using an internal class as the ChildProcessLauncher::Client, we can
+  // intercept OnProcessLaunched and do our own processing before
   // calling the subclass' implementation.
-  class ListenerHook : public IPC::Channel::Listener,
-                       public ChildProcessLauncher::Client {
+  class ClientHook : public ChildProcessLauncher::Client {
    public:
-    explicit ListenerHook(ChildProcessHost* host);
-    virtual void OnMessageReceived(const IPC::Message& msg);
-    virtual void OnChannelConnected(int32 peer_pid);
-    virtual void OnChannelError();
+    explicit ClientHook(BrowserChildProcessHost* host);
     virtual void OnProcessLaunched();
    private:
-    ChildProcessHost* host_;
+    BrowserChildProcessHost* host_;
   };
-
-  ListenerHook listener_;
-
+  ClientHook client_;
   // May be NULL if this current process has no resource dispatcher host.
   ResourceDispatcherHost* resource_dispatcher_host_;
-
-  bool opening_channel_;  // True while we're waiting the channel to be opened.
-  scoped_ptr<IPC::Channel> channel_;
-  std::string channel_id_;
   scoped_ptr<ChildProcessLauncher> child_process_;
 };
 
-#endif  // CHROME_BROWSER_CHILD_PROCESS_HOST_H_
+#endif  // CHROME_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
+