ApplicationConnection devolution, part 2.1.

examples/hello_mojo/hello_mojo_server.cc

 // Copyright 2016 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 <string>
 #include <utility>
 
 #include "examples/hello_mojo/hello_mojo.mojom.h"
 #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/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 
 using examples::HelloMojo;
 
 namespace {
 
 class HelloMojoImpl : public HelloMojo {
  public:
   explicit HelloMojoImpl(mojo::InterfaceRequest<HelloMojo> hello_mojo_request)
       : strong_binding_(this, std::move(hello_mojo_request)) {}
   ~HelloMojoImpl() override {}
 
   // |examples::HelloMojo| implementation:
   void Say(const mojo::String& request,
            const mojo::Callback<void(mojo::String)>& callback) override {
     callback.Run((request.get() == "hello") ? "mojo" : "WAT");
   }
 
  private:
   mojo::StrongBinding<HelloMojo> strong_binding_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(HelloMojoImpl);
 };
 
-class HelloMojoServerApp : public mojo::ApplicationDelegate,
-                           public mojo::InterfaceFactory<HelloMojo> {
+class HelloMojoServerApp : public mojo::ApplicationDelegate {
  public:
   HelloMojoServerApp() {}
   ~HelloMojoServerApp() override {}
 
   // |mojo::ApplicationDelegate| implementation:
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* application_connection) override {
-    application_connection->AddService<HelloMojo>(this);
+    application_connection->GetServiceProviderImpl().AddService<HelloMojo>(
+        [](const mojo::ConnectionContext& connection_context,
+           mojo::InterfaceRequest<HelloMojo> hello_mojo_request) {
+          new HelloMojoImpl(std::move(hello_mojo_request));  // Owns itself.
+        });
     return true;
   }
 
-  // |mojo::InterfaceFactory<HelloMojo>| implementation:
-  void Create(const mojo::ConnectionContext& connection_context,
-              mojo::InterfaceRequest<HelloMojo> hello_mojo_request) override {
-    new HelloMojoImpl(std::move(hello_mojo_request));  // Owns itself.
-  }
-
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(HelloMojoServerApp);
 };
 
 }  // namespace
 
 MojoResult MojoMain(MojoHandle application_request) {
   return mojo::ApplicationRunner(std::unique_ptr<mojo::ApplicationDelegate>(
                                      new HelloMojoServerApp()))
       .Run(application_request);
 }