Eliminate MojoApplicationHost

content/public/browser/utility_process_host.h

Index: content/public/browser/utility_process_host.h
diff --git a/content/public/browser/utility_process_host.h b/content/public/browser/utility_process_host.h
index 98cca9b3bbc17316aecf987e577dcf81df5b33f5..9581c254bf3db154b5e83bab31d8f49e7e552e27 100644
--- a/content/public/browser/utility_process_host.h
+++ b/content/public/browser/utility_process_host.h
@@ -17,6 +17,11 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
+namespace shell {
+class InterfaceProvider;
+class InterfaceRegistry;
+}
+
 namespace content {
 class ServiceRegistry;
 class UtilityProcessHostClient;
@@ -29,9 +34,9 @@ struct ChildProcessData;
 // If you need multiple batches of work to be done in the process, use
 // StartBatchMode(), then multiple calls to StartFooBar(p), then finish with
 // EndBatchMode().
-// If you need to call Mojo services, use Start() to start the child
-// process and GetServiceRegistry() to get the service registry to connect to
-// the child's Mojo services.
+// If you need to bind Mojo interfaces, use Start() to start the child
+// process and GetRemoteInterfaces() to get the shell::InterfaceProvider to
+// connect to the child's Mojo interfaces.
 //
 // Note: If your class keeps a ptr to an object of this type, grab a weak ptr to
 // avoid a use after free since this object is deleted synchronously but the
@@ -79,8 +84,13 @@ class UtilityProcessHost : public IPC::Sender {
   // Starts the utility process.
   virtual bool Start() = 0;
 
-  // Returns the ServiceRegistry for this process. Will never return nullptr.
-  virtual ServiceRegistry* GetServiceRegistry() = 0;
+  // Returns the shell::InterfaceRegistry the browser process uses to expose
+  // interfaces to the utility process.
+  virtual shell::InterfaceRegistry* GetInterfaceRegistry() = 0;
+
+  // Returns the shell::InterfaceProvider the browser process can use to bind
+  // interfaces exposed to it from the utility process.
+  virtual shell::InterfaceProvider* GetRemoteInterfaces() = 0;
 
   // Set the name of the process to appear in the task manager.
   virtual void SetName(const base::string16& name) = 0;