ApplicationConnection devolution, part 2.3.

shell/test/pingable_app.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 <memory>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_runner.h"
-#include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "shell/test/pingable.mojom.h"
 
 using mojo::String;
 
 class PingableImpl : public Pingable {
  public:
   PingableImpl(mojo::InterfaceRequest<Pingable> request,
@@ skipping 10 matching lines @@
       const String& message,
       const mojo::Callback<void(String, String, String)>& callback) override {
     callback.Run(app_url_, connection_url_, message);
   }
 
   mojo::StrongBinding<Pingable> binding_;
   std::string app_url_;
   std::string connection_url_;
 };
 
-class PingableApp : public mojo::ApplicationDelegate,
-                    public mojo::InterfaceFactory<Pingable> {
+class PingableApp : public mojo::ApplicationDelegate {
  public:
   PingableApp() {}
   ~PingableApp() override {}
 
  private:
   // ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* impl) override {
     app_url_ = impl->url();
   }
 
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService(this);
+    connection->GetServiceProviderImpl().AddService<Pingable>(
+        [this](const mojo::ConnectionContext& connection_context,
+               mojo::InterfaceRequest<Pingable> pingable_request) {
+          new PingableImpl(pingable_request.Pass(), app_url_,
+                           connection_context.connection_url);
+        });
     return true;
   }
 
-  // InterfaceFactory<Pingable>:
-  void Create(const mojo::ConnectionContext& connection_context,
-              mojo::InterfaceRequest<Pingable> request) override {
-    new PingableImpl(request.Pass(), app_url_,
-                     connection_context.connection_url);
-  }
-
   std::string app_url_;
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(
       std::unique_ptr<PingableApp>(new PingableApp()));
   return runner.Run(application_request);
 }