Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

content/browser/browser_child_process_host_impl.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_BROWSER_CHILD_PROCESS_HOST_IMPL_H_
 #define CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_IMPL_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 22 matching lines @@
 
 namespace shell {
 class InterfaceProvider;
 }
 
 namespace content {
 
 class BrowserChildProcessHostIterator;
 class BrowserChildProcessObserver;
 class BrowserMessageFilter;
-class MojoChildConnection;
 
 // Plugins/workers and other child processes that live on the IO thread use this
 // class. RenderProcessHostImpl is the main exception that doesn't use this
 /// class because it lives on the UI thread.
 class CONTENT_EXPORT BrowserChildProcessHostImpl
     : public BrowserChildProcessHost,
       public NON_EXPORTED_BASE(ChildProcessHostDelegate),
 #if defined(OS_WIN)
       public base::win::ObjectWatcher::Delegate,
 #endif
       public ChildProcessLauncher::Client {
  public:
   BrowserChildProcessHostImpl(content::ProcessType process_type,
                               BrowserChildProcessHostDelegate* delegate,
-                              const std::string& service_name);
+                              const std::string& mojo_child_token);
   ~BrowserChildProcessHostImpl() override;
 
   // Terminates all child processes and deletes each BrowserChildProcessHost
   // instance.
   static void TerminateAll();
 
   // 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);
 
   // BrowserChildProcessHost implementation:
   bool Send(IPC::Message* message) override;
   void Launch(SandboxedProcessLauncherDelegate* delegate,
               base::CommandLine* cmd_line,
               bool terminate_on_shutdown) override;
   const ChildProcessData& GetData() const override;
   ChildProcessHost* GetHost() const override;
   base::TerminationStatus GetTerminationStatus(bool known_dead,
                                                int* exit_code) override;
   void SetName(const base::string16& name) override;
   void SetHandle(base::ProcessHandle handle) override;
+  shell::InterfaceProvider* GetRemoteInterfaces() override;
 
   // ChildProcessHostDelegate implementation:
   bool CanShutdown() override;
   void OnChildDisconnected() override;
   const base::Process& GetProcess() const override;
-  shell::InterfaceProvider* GetRemoteInterfaces() override;
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
   void OnBadMessageReceived(const IPC::Message& message) override;
 
   // Terminates the process and logs an error after a bad message was received
   // from the child process.
   void TerminateOnBadMessageReceived(uint32_t type);
 
   // Removes this host from the host list. Calls ChildProcessHost::ForceShutdown
   void ForceShutdown();
 
   // Callers can reduce the BrowserChildProcess' priority.
   void SetBackgrounded(bool backgrounded);
 
   // Adds an IPC message filter.
   void AddFilter(BrowserMessageFilter* filter);
 
   static void HistogramBadMessageTerminated(int process_type);
 
   BrowserChildProcessHostDelegate* delegate() const { return delegate_; }
 
-  MojoChildConnection* child_connection() const {
-    return child_connection_.get();
-  }
-
   typedef std::list<BrowserChildProcessHostImpl*> BrowserChildProcessList;
  private:
   friend class BrowserChildProcessHostIterator;
   friend class BrowserChildProcessObserver;
 
   static BrowserChildProcessList* GetIterator();
 
   static void AddObserver(BrowserChildProcessObserver* observer);
   static void RemoveObserver(BrowserChildProcessObserver* observer);
 
@@ skipping 11 matching lines @@
       const std::string& error);
 
 #if defined(OS_WIN)
   // ObjectWatcher::Delegate implementation.
   void OnObjectSignaled(HANDLE object) override;
 #endif
 
   ChildProcessData data_;
   BrowserChildProcessHostDelegate* delegate_;
   std::unique_ptr<ChildProcessHost> child_process_host_;
-
-  const std::string child_token_;
-  std::unique_ptr<MojoChildConnection> child_connection_;
+  const std::string mojo_child_token_;
 
   std::unique_ptr<ChildProcessLauncher> child_process_;
 
   PowerMonitorMessageBroadcaster power_monitor_message_broadcaster_;
 
 #if defined(OS_WIN)
   // Watches to see if the child process exits before the IPC channel has
   // been connected. Thereafter, its exit is determined by an error on the
   // IPC channel.
   base::win::ObjectWatcher early_exit_watcher_;
 #endif
 
   bool is_channel_connected_;
   bool notify_child_disconnected_;
 
   base::WeakPtrFactory<BrowserChildProcessHostImpl> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_IMPL_H_