ApplicationConnection devolution, part 2.2.

services/nacl/nonsfi/pnacl_link.cc

Index: services/nacl/nonsfi/pnacl_link.cc
diff --git a/services/nacl/nonsfi/pnacl_link.cc b/services/nacl/nonsfi/pnacl_link.cc
index 299a19064ad02f0085489c9008b83e3e1c17cfb6..e2d3fadad9e583d62f8e5953246534587826cfc3 100644
--- a/services/nacl/nonsfi/pnacl_link.cc
+++ b/services/nacl/nonsfi/pnacl_link.cc
@@ -11,7 +11,6 @@
 #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/strong_binding.h"
 #include "services/nacl/nonsfi/kLdNexe.h"
 #include "services/nacl/nonsfi/pnacl_link.mojom.h"
@@ -39,22 +38,19 @@ class StrongBindingPexeLinkerImpl : public PexeLinkerImpl {
   StrongBinding<PexeLinkerInit> strong_binding_;
 };
 
-class MultiPexeLinker : public ApplicationDelegate,
-                        public InterfaceFactory<PexeLinkerInit> {
+class MultiPexeLinker : public ApplicationDelegate {
  public:
   MultiPexeLinker() {}
 
   // From ApplicationDelegate
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
-    connection->AddService<PexeLinkerInit>(this);
+    connection->GetServiceProviderImpl().AddService<PexeLinkerInit>(
+        [](const ConnectionContext& connection_context,
+           InterfaceRequest<PexeLinkerInit> request) {
+          new StrongBindingPexeLinkerImpl(request.Pass());
+        });
     return true;
   }
-
-  // From InterfaceFactory
-  void Create(const ConnectionContext& connection_context,
-              InterfaceRequest<PexeLinkerInit> request) override {
-    new StrongBindingPexeLinkerImpl(request.Pass());
-  }
 };
 
 }  // namespace nacl