ApplicationConnection devolution, part 2.1.

examples/native_run_app/native_run_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.
 
 // This is a terminal client (i.e., a "raw" |mojo.terminal.Terminal| -- e.g.,
 // moterm -- can be asked to talk to this) that prompts the user for a native
 // (Linux) binary to run and then does so (via mojo:native_support).
 //
 // E.g., first run mojo:moterm_example_app (embedded by a window manager). Then,
 // at the prompt, enter "mojo:native_run_app". At the next prompt, enter "bash"
@@ skipping 10 matching lines @@
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "mojo/application/application_runner_chromium.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_impl.h"
 #include "mojo/public/cpp/application/connect.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/services/files/interfaces/files.mojom.h"
 #include "mojo/services/files/interfaces/ioctl.mojom.h"
 #include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/native_support/interfaces/process.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
 
 using mojo::terminal::TerminalClient;
@@ skipping 172 matching lines @@
     }
   }
 
  private:
   mojo::StrongBinding<TerminalClient> binding_;
   native_support::Process* native_support_process_;
 
   DISALLOW_COPY_AND_ASSIGN(TerminalClientImpl);
 };
 
-class NativeRunApp : public mojo::ApplicationDelegate,
-                     public mojo::InterfaceFactory<TerminalClient> {
+class NativeRunApp : public mojo::ApplicationDelegate {
  public:
   NativeRunApp() : application_impl_(nullptr) {}
   ~NativeRunApp() override {}
 
  private:
   // |mojo::ApplicationDelegate|:
   void Initialize(mojo::ApplicationImpl* application_impl) override {
     DCHECK(!application_impl_);
     application_impl_ = application_impl;
     mojo::ConnectToService(application_impl_->shell(), "mojo:native_support",
                            GetProxy(&native_support_process_));
   }
 
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService<TerminalClient>(this);
+    connection->GetServiceProviderImpl().AddService<TerminalClient>(
+        [this](const mojo::ConnectionContext& connection_context,
+               mojo::InterfaceRequest<TerminalClient> terminal_client_request) {
+          new TerminalClientImpl(terminal_client_request.Pass(),
+                                 native_support_process_.get());
+        });
     return true;
   }
 
-  // |InterfaceFactory<TerminalClient>| implementation:
-  void Create(const mojo::ConnectionContext& /*connection_context*/,
-              mojo::InterfaceRequest<TerminalClient> request) override {
-    new TerminalClientImpl(request.Pass(), native_support_process_.get());
-  }
-
   mojo::ApplicationImpl* application_impl_;
   native_support::ProcessPtr native_support_process_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeRunApp);
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new NativeRunApp());
   return runner.Run(application_request);
 }