ApplicationConnection devolution, part 2.1.

examples/echo_terminal/main.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 <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/binding_set.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/interface_factory.h"
 #include "mojo/services/files/interfaces/file.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
 
 const uint32_t kMaxBytesToRead = 1000;
 
 // Owns itself.
 class TerminalEchoer {
  public:
   explicit TerminalEchoer(mojo::files::FilePtr terminal)
@@ skipping 64 matching lines @@
   }
 
   mojo::files::FilePtr terminal_;
   size_t last_bytes_read_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TerminalEchoer);
 };
 
 class EchoTerminalApp
     : public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::terminal::TerminalClient>,
       public mojo::terminal::TerminalClient {
  public:
   EchoTerminalApp() {}
   ~EchoTerminalApp() override {}
 
  private:
   // |ApplicationDelegate| override:
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService<mojo::terminal::TerminalClient>(this);
+    connection->GetServiceProviderImpl()
+        .AddService<mojo::terminal::TerminalClient>([this](
+            const mojo::ConnectionContext& connection_context,
+            mojo::InterfaceRequest<mojo::terminal::TerminalClient>
+                terminal_client_request) {
+          terminal_clients_.AddBinding(this, terminal_client_request.Pass());
+        });
     return true;
   }
 
-  // |InterfaceFactory<mojo::terminal::TerminalClient>| implementation:
-  void Create(
-      const mojo::ConnectionContext& connection_context,
-      mojo::InterfaceRequest<mojo::terminal::TerminalClient> request) override {
-    terminal_clients_.AddBinding(this, request.Pass());
-  }
-
   // |mojo::terminal::TerminalClient| implementation:
   void ConnectToTerminal(
       mojo::InterfaceHandle<mojo::files::File> terminal) override {
     DCHECK(terminal);
     // The |TerminalEchoer| will own itself.
     (new TerminalEchoer(mojo::files::FilePtr::Create(std::move(terminal))))
         ->StartReading();
   }
 
   mojo::BindingSet<mojo::terminal::TerminalClient> terminal_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp);
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new EchoTerminalApp());
   return runner.Run(application_request);
 }