Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/launcher/launcher.cc

 // 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/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_tokenizer.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/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h"
 #include "mojo/services/public/interfaces/network/network_service.mojom.h"
 #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace launcher {
 
 namespace {
 
 typedef mojo::Callback<void(String handler_url, String view_url,
     navigation::ResponseDetailsPtr response)> LaunchCallback;
 
 }
 
 class LauncherApp;
 
-class LauncherConnection : public InterfaceImpl<Launcher> {
+class LauncherConnection : public InterfaceImplDeleteOnError<Launcher> {
  public:
-  LauncherConnection(ApplicationConnection* connection, LauncherApp* app)
-      : app_(app) {}
+  explicit LauncherConnection(LauncherApp* app) : app_(app) {}
   virtual ~LauncherConnection() {}
 
  private:
   // Overridden from Launcher:
   virtual void Launch(const String& url,
                       const LaunchCallback& callback) OVERRIDE;
 
   LauncherApp* app_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherConnection);
@@ skipping 44 matching lines @@
 
   LauncherApp* app_;
   bool destroy_scheduled_;
   const LaunchCallback callback_;
   URLLoaderPtr url_loader_;
   ScopedDataPipeConsumerHandle response_body_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(LaunchInstance);
 };
 
-class LauncherApp : public ApplicationDelegate {
+class LauncherApp : public ApplicationDelegate,
+                    public InterfaceProvider<Launcher> {
  public:
   LauncherApp() {
     handler_map_["text/html"] = "mojo:mojo_html_viewer";
     handler_map_["image/png"] = "mojo:mojo_media_viewer";
   }
   virtual ~LauncherApp() {}
 
   URLLoaderPtr CreateURLLoader() {
     URLLoaderPtr loader;
     network_service_->CreateURLLoader(Get(&loader));
     return loader.Pass();
   }
 
   std::string GetHandlerForContentType(const std::string& content_type) {
     HandlerMap::const_iterator it = handler_map_.find(content_type);
     return it != handler_map_.end() ? it->second : "";
   }
 
  private:
   typedef std::map<std::string, std::string> HandlerMap;
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     app->ConnectToService("mojo:mojo_network_service", &network_service_);
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    connection->AddService<LauncherConnection>(this);
+    connection->AddServiceProvider(this);
     return true;
   }
 
+  // Overridden from InterfaceProvider<Launcher>
+  virtual void BindToRequest(ApplicationConnection* connection,
+                             InterfaceRequest<Launcher> request) OVERRIDE {
+    mojo::BindToRequest(new LauncherConnection(this), &request);
+  }
+
   HandlerMap handler_map_;
 
   NetworkServicePtr network_service_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherApp);
 };
 
 void LauncherConnection::Launch(const String& url_string,
                                 const LaunchCallback& callback) {
   GURL url(url_string.To<std::string>());
@@ skipping 42 matching lines @@
 }
 
 }  // namespace launcher
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new launcher::LauncherApp;
 }
 
 }  // namespace mojo