ApplicationConnection devolution, part 2.1.

examples/echo_terminal/main.cc

Index: examples/echo_terminal/main.cc
diff --git a/examples/echo_terminal/main.cc b/examples/echo_terminal/main.cc
index 348d96c5370bf747eb70ef30ea18638edc3da88b..14c7c3f3993f6c87d98978282d1326a83e146a31 100644
--- a/examples/echo_terminal/main.cc
+++ b/examples/echo_terminal/main.cc
@@ -13,7 +13,6 @@
 #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"
@@ -98,7 +97,6 @@ class TerminalEchoer {
 
 class EchoTerminalApp
     : public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::terminal::TerminalClient>,
       public mojo::terminal::TerminalClient {
  public:
   EchoTerminalApp() {}
@@ -108,17 +106,16 @@ class EchoTerminalApp
   // |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 {