Mojo: Use InterfaceFactory<Interface> for service registration

mojo/dbus/dbus_external_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "mojo/embedder/channel_init.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/interface_factory.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/shell/external_service.mojom.h"
 
 namespace mojo {
 const char kMojoDBusImplPath[] = "/org/chromium/MojoImpl";
 const char kMojoDBusInterface[] = "org.chromium.Mojo";
 const char kMojoDBusConnectMethod[] = "ConnectChannel";
 
 class DBusExternalServiceBase {
  public:
@@ skipping 19 matching lines @@
   void TakeDBusServiceOwnership();
 
   const std::string service_name_;
   scoped_refptr<dbus::Bus> bus_;
   dbus::ExportedObject* exported_object_;  // Owned by bus_;
   scoped_ptr<embedder::ChannelInit> channel_init_;
   DISALLOW_COPY_AND_ASSIGN(DBusExternalServiceBase);
 };
 
 template <class ServiceImpl>
-class DBusExternalService : public DBusExternalServiceBase,
-                            public ApplicationDelegate {
+class DBusExternalService
+    : public DBusExternalServiceBase,
+      public ApplicationDelegate,
+      public InterfaceFactory<typename ServiceImpl::ImplementedInterface> {
  public:
   explicit DBusExternalService(const std::string& service_name)
       : DBusExternalServiceBase(service_name) {
   }
   virtual ~DBusExternalService() {}
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    connection->AddService<ServiceImpl>();
+    connection->AddService(this);
     return true;
   }
 
+  virtual void Create(
+      ApplicationConnection* connection,
+      InterfaceRequest<typename ServiceImpl::ImplementedInterface> request)
+      MOJO_OVERRIDE {
+    BindToRequest(new ServiceImpl, &request);
+  }
+
  protected:
   virtual void Connect(ScopedMessagePipeHandle client_handle) OVERRIDE {
     external_service_.reset(BindToPipe(new Impl(this), client_handle.Pass()));
   }
 
   virtual void Disconnect() OVERRIDE {
     external_service_.reset();
   }
 
  private:
@@ skipping 10 matching lines @@
     }
    private:
     DBusExternalService* service_;
     scoped_ptr<Application> app_;
   };
 
   scoped_ptr<Impl> external_service_;
 };
 
 }  // namespace mojo