mojo: Use ContentHandlers to bundle multiple Applications into a module.

components/core_services/core_services_application_delegate.cc

Index: components/core_services/core_services_application_delegate.cc
diff --git a/components/core_services/core_services_application_delegate.cc b/components/core_services/core_services_application_delegate.cc
index 29669503d6305b4a1563b9643ee622f2361e46c2..bf4ff2f7a8964d1883888498c60306bd04ceb34a 100644
--- a/components/core_services/core_services_application_delegate.cc
+++ b/components/core_services/core_services_application_delegate.cc
@@ -4,8 +4,9 @@
 
 #include "components/core_services/core_services_application_delegate.h"
 
-#include "components/clipboard/clipboard_standalone_impl.h"
+#include "components/clipboard/clipboard_application_delegate.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 
 namespace core_services {
 
@@ -15,43 +16,29 @@ CoreServicesApplicationDelegate::~CoreServicesApplicationDelegate() {}
 
 bool CoreServicesApplicationDelegate::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
-  // TODO(erg): For version one, we'll just say that all incoming connections
-  // get access to the same objects, which imply that there will be one
-  // instance of the service in its own process. However, in the long run,
-  // we'll want this to be more configurable. Some services are singletons,
-  // while we'll want to spawn a new process with multiple instances for other
-  // services.
-  connection->AddService<mojo::ServiceProvider>(this);
+  connection->AddService(this);
   return true;
 }
 
 void CoreServicesApplicationDelegate::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<ServiceProvider> request) {
-  provider_bindings_.AddBinding(this, request.Pass());
+    mojo::InterfaceRequest<mojo::ContentHandler> request) {
+  handler_bindings_.AddBinding(this, request.Pass());
 }
 
-void CoreServicesApplicationDelegate::ConnectToService(
-    const mojo::String& service_name,
-    mojo::ScopedMessagePipeHandle client_handle) {
-  if (service_name == mojo::Clipboard::Name_) {
-    // TODO(erg): So what we do here probably doesn't look like the
-    // InProcessNativeRunner / NativeApplicationSupport.
-    // native_application_support.cc does the whole SetThunks() stuff. This has
-    // already happened since Core Services is a mojo application. So we want
-    // some sort of lightweight runner here.
-    //
-    // But...the actual child process stuff is its own mojom! (Also, it's
-    // entangled with mojo::Shell::ChildProcessMain().) All concept of app
-    // paths are the things which are used to execute the application in
-    // child_process.cc.
-
-    // TODO(erg): The lifetime of ClipboardStandaloneImpl is wrong. Right now,
-    // a new object is made for each request, but we obviously want there to be
-    // one clipboard across all callers.
-    new clipboard::ClipboardStandaloneImpl(
-        mojo::MakeRequest<mojo::Clipboard>(client_handle.Pass()));
+void CoreServicesApplicationDelegate::StartApplication(
+    mojo::InterfaceRequest<mojo::Application> request,
+    mojo::URLResponsePtr response) {
+  std::string url = response->url;
+  if (url == "mojo://clipboard/") {
+    // TODO(erg): This is where we should deal with running things on separate
+    // threads.
+    new mojo::ApplicationImpl(new clipboard::ClipboardApplicationDelegate,

[sky, 2015/04/30 21:59:08]

I suspect this leaks. Can you add a TODO about tracking that down.

[Elliot Glaysher, 2015/05/01 17:00:03]

Switched to smart ptrs.

+                              request.Pass());
+    return;
   }
+
+  NOTREACHED() << "Unknown service '" << url << "'";
 }
 
 }  // namespace core_services