Yet more ApplicationDelegate/ApplicationRunner conversion.

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 e4c741e55518614eb942eff9af67025c94577a38..9a2ef2454881f3f7c0be40beabc61373d21a9e3e 100644
--- a/services/nacl/nonsfi/pnacl_link.cc
+++ b/services/nacl/nonsfi/pnacl_link.cc
@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <memory>
-
 #include "base/logging.h"
 #include "mojo/nacl/nonsfi/file_util.h"
 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_runner.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/nacl/nonsfi/kLdNexe.h"
@@ -38,13 +36,12 @@ class StrongBindingPexeLinkerImpl : public PexeLinkerImpl {
   StrongBinding<PexeLinkerInit> strong_binding_;
 };
 
-class MultiPexeLinker : public ApplicationDelegate {
+class MultiPexeLinker : public ApplicationImplBase {
  public:
   MultiPexeLinker() {}
 
-  // From ApplicationDelegate
-  bool ConfigureIncomingConnection(
-      ServiceProviderImpl* service_provider_impl) override {
+  // From ApplicationImplBase
+  bool OnAcceptConnection(ServiceProviderImpl* service_provider_impl) override {
     service_provider_impl->AddService<PexeLinkerInit>(
         [](const ConnectionContext& connection_context,
            InterfaceRequest<PexeLinkerInit> request) {
@@ -58,7 +55,6 @@ class MultiPexeLinker : public ApplicationDelegate {
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeLinker>(
-      new mojo::nacl::MultiPexeLinker()));
-  return runner.Run(application_request);
+  mojo::nacl::MultiPexeLinker multi_pexe_linker;
+  return mojo::RunMainApplication(application_request, &multi_pexe_linker);
 }