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

components/core_services/core_services_application_delegate.h

Index: components/core_services/core_services_application_delegate.h
diff --git a/components/core_services/core_services_application_delegate.h b/components/core_services/core_services_application_delegate.h
index 2662e410bff08f6b1be9105ab3580b2ceab63609..9b40daaa6edd9806093aa7f80f63343a6d1e7a14 100644
--- a/components/core_services/core_services_application_delegate.h
+++ b/components/core_services/core_services_application_delegate.h
@@ -6,10 +6,11 @@
 #define COMPONENTS_CORE_SERVICES_APPLICATION_DELEGATE_H_
 
 #include "base/macros.h"
+#include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
+#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace core_services {
 
@@ -17,8 +18,8 @@ namespace core_services {
 // instance of the CoreServices ServiceProvider.
 class CoreServicesApplicationDelegate
     : public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::ServiceProvider>,
-      public mojo::ServiceProvider {
+      public mojo::InterfaceFactory<mojo::ContentHandler>,
+      public mojo::ContentHandler {
  public:
   CoreServicesApplicationDelegate();
   ~CoreServicesApplicationDelegate() override;
@@ -28,16 +29,19 @@ class CoreServicesApplicationDelegate
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
-  // Overridden from mojo::InterfaceFactory<ServiceProvider>:
+  // Overridden from mojo::InterfaceFactory<mojo::ContentHandler>:
   void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<ServiceProvider> request) override;
+              mojo::InterfaceRequest<mojo::ContentHandler> request) override;
 
-  // Overridden from ServiceProvider:
-  void ConnectToService(const mojo::String& service_name,
-                        mojo::ScopedMessagePipeHandle client_handle) override;
+  // Overridden from mojo::ContentHandler:
+  void StartApplication(
+      mojo::InterfaceRequest<mojo::Application> request,
+      mojo::URLResponsePtr response) override;
 
   // Bindings for all of our connections.
-  mojo::WeakBindingSet<ServiceProvider> provider_bindings_;
+  mojo::WeakBindingSet<ContentHandler> handler_bindings_;
+
+  scoped_ptr<mojo::ApplicationImpl> clipboard_application_;
 
   DISALLOW_COPY_AND_ASSIGN(CoreServicesApplicationDelegate);
 };