ApplicationConnection devolution, part 2.1.

examples/content_handler_demo/content_handler_demo.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 <stdio.h>
 
 #include <memory>
 #include <utility>
 
 #include "mojo/public/c/system/main.h"
@@ skipping 74 matching lines @@
   void StartApplication(InterfaceRequest<Application> application,
                         URLResponsePtr response) override {
     // The application will delete itself after being connected to.
     new PrintBodyApplication(application.Pass(), response->body.Pass());
   }
 
   StrongBinding<ContentHandler> binding_;
   MOJO_DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
 
-class ContentHandlerApp : public ApplicationDelegate,
-                          public InterfaceFactory<ContentHandler> {
+class ContentHandlerApp : public ApplicationDelegate {
  public:
   ContentHandlerApp() {}
   ~ContentHandlerApp() override {}
 
   void Initialize(ApplicationImpl* app) override {}
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
-    connection->AddService(this);
+    connection->GetServiceProviderImpl().AddService<ContentHandler>(
+        [](const ConnectionContext& connection_context,
+           InterfaceRequest<ContentHandler> content_handler_request) {
+          new ContentHandlerImpl(content_handler_request.Pass());
+        });
     return true;
   }
 
-  void Create(const ConnectionContext& connection_context,
-              InterfaceRequest<ContentHandler> request) override {
-    new ContentHandlerImpl(request.Pass());
-  }
-
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(ContentHandlerApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(
       std::unique_ptr<mojo::examples::ContentHandlerApp>(
           new mojo::examples::ContentHandlerApp()));
   return runner.Run(application_request);
 }