Enable ChannelMojo for non-renderer child processes

content/common/child_process_host_impl.h

Index: content/common/child_process_host_impl.h
diff --git a/content/common/child_process_host_impl.h b/content/common/child_process_host_impl.h
index 93ff0ebe1d1b33802cd7b4ca2348c6e74a13a41f..4e6ae68ff5c8e98a13402bc0f4b6a69a8de1bf5c 100644
--- a/content/common/child_process_host_impl.h
+++ b/content/common/child_process_host_impl.h
@@ -26,6 +26,7 @@ class FilePath;
 
 namespace IPC {
 class MessageFilter;
+class ChannelMojoHost;
 }
 
 namespace content {
@@ -61,6 +62,8 @@ class CONTENT_EXPORT ChildProcessHostImpl : public ChildProcessHost,
   std::string CreateChannel() override;
   bool IsChannelOpening() override;
   void AddFilter(IPC::MessageFilter* filter) override;
+  void OnProcessLaunched(base::ProcessHandle process) override;
+
 #if defined(OS_POSIX)
   base::ScopedFD TakeClientFileDescriptor() override;
 #endif
@@ -92,6 +95,7 @@ class CONTENT_EXPORT ChildProcessHostImpl : public ChildProcessHost,
   base::Process peer_process_;
   bool opening_channel_;  // True while we're waiting the channel to be opened.
   scoped_ptr<IPC::Channel> channel_;
+  scoped_ptr<IPC::ChannelMojoHost> channel_mojo_host_;
   std::string channel_id_;
 
   // Holds all the IPC message filters.  Since this object lives on the IO