Eliminate MojoApplicationHost

services/shell/public/cpp/shell_client.h

Index: services/shell/public/cpp/shell_client.h
diff --git a/services/shell/public/cpp/shell_client.h b/services/shell/public/cpp/shell_client.h
index d9513b76e108e3454d445e331cc4e8d558d6d976..61195baa41ef4bd4fe662ba29068dda853c91ca4 100644
--- a/services/shell/public/cpp/shell_client.h
+++ b/services/shell/public/cpp/shell_client.h
@@ -35,6 +35,15 @@ class ShellClient {
                           const Identity& identity,
                           uint32_t id);
 
+  // TODO(beng): REMOVE
+  // These two methods exist only temporarily to allow renderer service
+  // registration to happen async with AcceptConnection. This is because there
+  // are currently two channels between browser & renderer, one for Chrome IPC
+  // and one for Mojo ShellClient. These will be combined shortly.
+  // DO NOT OVERRIDE THESE METHODS UNDER ANY CIRCUMSTANCES.
+  virtual InterfaceProvider* GetInterfaceProviderForConnection();
+  virtual InterfaceRegistry* GetInterfaceRegistryForConnection();
+
   // Called when a connection to this client is brokered by the shell. Override
   // to expose services to the remote application. Return true if the connection
   // should succeed. Return false if the connection should be rejected and the