ApplicationConnection devolution, part 2.1.

mojo/public/cpp/bindings/tests/versioning_test_service.cc

 // Copyright 2015 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 <map>
 #include <memory>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_runner.h"
-#include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
 
 namespace mojo {
 namespace test {
 namespace versioning {
 
 struct EmployeeInfo {
  public:
@@ skipping 63 matching lines @@
     employees_[id]->finger_print = finger_print.Pass();
     callback.Run(true);
   }
 
  private:
   std::map<uint64_t, EmployeeInfo*> employees_;
 
   StrongBinding<HumanResourceDatabase> strong_binding_;
 };
 
-class HumanResourceSystemServer
-    : public ApplicationDelegate,
-      public InterfaceFactory<HumanResourceDatabase> {
+class HumanResourceSystemServer : public ApplicationDelegate {
  public:
   HumanResourceSystemServer() {}
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
-    connection->AddService<HumanResourceDatabase>(this);
+    connection->GetServiceProviderImpl().AddService<HumanResourceDatabase>(
+        [](const ConnectionContext& connection_context,
+           InterfaceRequest<HumanResourceDatabase> hr_db_request) {
+          // It will be deleted automatically when the underlying pipe
+          // encounters a connection error.
+          new HumanResourceDatabaseImpl(hr_db_request.Pass());
+        });
     return true;
   }
-
-  // InterfaceFactory<HumanResourceDatabase> implementation.
-  void Create(const ConnectionContext& connection_context,
-              InterfaceRequest<HumanResourceDatabase> request) override {
-    // It will be deleted automatically when the underlying pipe encounters a
-    // connection error.
-    new HumanResourceDatabaseImpl(request.Pass());
-  }
 };
 
 }  // namespace versioning
 }  // namespace test
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(
       std::unique_ptr<mojo::test::versioning::HumanResourceSystemServer>(
           new mojo::test::versioning::HumanResourceSystemServer()));
 
   return runner.Run(application_request);
 }