Support exposing Mojo services between render frames, render threads, and their respective hosts.

content/child/mojo/mojo_application.h

Index: content/child/mojo/mojo_application.h
diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h
index 53fd54171e22286f39cb0ce0462c29d975bbeaab..d7454027808ffba1f34e617d7448b8e84209b5be 100644
--- a/content/child/mojo/mojo_application.h
+++ b/content/child/mojo/mojo_application.h
@@ -5,9 +5,9 @@
 #ifndef CONTENT_CHILD_MOJO_MOJO_APPLICATION_H_
 #define CONTENT_CHILD_MOJO_MOJO_APPLICATION_H_
 
+#include "content/common/mojo/service_registry_impl.h"
 #include "ipc/ipc_platform_file.h"
 #include "mojo/embedder/channel_init.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace IPC {
 class Message;
@@ -18,27 +18,22 @@ namespace content {
 // MojoApplication represents the code needed to setup a child process as a
 // Mojo application via Chrome IPC. Instantiate MojoApplication and call its
 // OnMessageReceived method to give it a shot at handling Chrome IPC messages.
-// It makes the mojo::Shell interface available and calls methods on the given
-// mojo::ShellClient interface as calls come in.
+// It makes the ServiceRegistry interface available.
 class MojoApplication {
  public:
-  // The ShellClient pointer must remain valid for the lifetime of the
-  // MojoApplication instance.
-  explicit MojoApplication(mojo::ServiceProvider* service_provider);
-  ~MojoApplication();
+  MojoApplication();
+  virtual ~MojoApplication();
 
   bool OnMessageReceived(const IPC::Message& msg);
 
-  mojo::ServiceProvider* host_service_provider() {
-    return host_service_provider_.get();
-  }
+  ServiceRegistry* service_registry() { return &service_registry_; }
 
  private:
   void OnActivate(const IPC::PlatformFileForTransit& file);
 
   mojo::embedder::ChannelInit channel_init_;
-  mojo::ServiceProviderPtr host_service_provider_;
-  mojo::ServiceProvider* service_provider_;
+
+  ServiceRegistryImpl service_registry_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoApplication);
 };