ApplicationConnection devolution, part 2.4.

services/nacl/nonsfi/content_handler_main_nexe.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.
 
 #include <fcntl.h>
 
 #include "base/files/file_util.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
@@ skipping 10 matching lines @@
  public:
   NaClContentHandler() : content_handler_factory_(this) {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {}
 
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService(&content_handler_factory_);
+    connection->GetServiceProviderImpl().AddService<mojo::ContentHandler>(
+        content_handler_factory_.GetInterfaceRequestHandler());
     return true;
   }
 
   // Overridden from ContentHandlerFactory::Delegate:
   void RunApplication(
       mojo::InterfaceRequest<mojo::Application> application_request,
       mojo::URLResponsePtr response) override {
     // Needed to use Mojo interfaces on this thread.
     base::MessageLoop loop(mojo::common::MessagePumpMojo::Create());
     // Acquire the nexe.
@@ skipping 19 matching lines @@
 };
 
 }  // namespace content_handler
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new nacl::content_handler::NaClContentHandler());
   return runner.Run(application_request);
 }