Eliminate MojoApplicationHost

content/browser/utility_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_UTILITY_PROCESS_HOST_IMPL_H_
 #define CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/utility_process_host.h"
 
 namespace base {
 class SequencedTaskRunner;
 class Thread;
 }
 
 namespace content {
 class BrowserChildProcessHostImpl;
 class InProcessChildThreadParams;
-class MojoApplicationHost;
+class MojoChildConnection;
 
 typedef base::Thread* (*UtilityMainThreadFactoryFunction)(
     const InProcessChildThreadParams&);
 
 class CONTENT_EXPORT UtilityProcessHostImpl
     : public NON_EXPORTED_BASE(UtilityProcessHost),
       public BrowserChildProcessHostDelegate {
  public:
   static void RegisterUtilityMainThreadFactory(
       UtilityMainThreadFactoryFunction create);
@@ skipping 11 matching lines @@
   void SetExposedDir(const base::FilePath& dir) override;
   void DisableSandbox() override;
 #if defined(OS_WIN)
   void ElevatePrivileges() override;
 #endif
   const ChildProcessData& GetData() override;
 #if defined(OS_POSIX)
   void SetEnv(const base::EnvironmentMap& env) override;
 #endif
   bool Start() override;
-  ServiceRegistry* GetServiceRegistry() override;
+  shell::InterfaceRegistry* GetInterfaceRegistry() override;
+  shell::InterfaceProvider* GetRemoteInterfaces() override;
   void SetName(const base::string16& name) override;
 
   void set_child_flags(int flags) { child_flags_ = flags; }
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
   // Launch the zygote early in the browser startup.
   static void EarlyZygoteLaunch();
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 
  private:
@@ skipping 39 matching lines @@
   // A user-visible name identifying this process. Used to indentify this
   // process in the task manager.
   base::string16 name_;
 
   std::unique_ptr<BrowserChildProcessHostImpl> process_;
 
   // Used in single-process mode instead of process_.
   std::unique_ptr<base::Thread> in_process_thread_;
 
   // Browser-side Mojo endpoint which sets up a Mojo channel with the child
-  // process and contains the browser's ServiceRegistry.
+  // process and contains the browser's shell::InterfaceRegistry.
   const std::string child_token_;
-  std::unique_ptr<MojoApplicationHost> mojo_application_host_;
+  std::unique_ptr<MojoChildConnection> mojo_child_connection_;
 
   // Used to vend weak pointers, and should always be declared last.
   base::WeakPtrFactory<UtilityProcessHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_UTILITY_PROCESS_HOST_IMPL_H_