ApplicationConnection devolution, part 2.1.

examples/native_run_app/native_run_app.cc

Index: examples/native_run_app/native_run_app.cc
diff --git a/examples/native_run_app/native_run_app.cc b/examples/native_run_app/native_run_app.cc
index 7a616360738b00e6f7ba64d1e6da5d301d949ae7..ba75d552b39a061927b361f7462841c7e8386ba5 100644
--- a/examples/native_run_app/native_run_app.cc
+++ b/examples/native_run_app/native_run_app.cc
@@ -28,7 +28,6 @@
 #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"
@@ -221,8 +220,7 @@ class TerminalClientImpl : public TerminalClient {
   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 {}
@@ -238,16 +236,15 @@ class NativeRunApp : public mojo::ApplicationDelegate,
 
   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_;