ApplicationConnection devolution, part 3.

services/nacl/sfi/content_handler_main.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 "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
@@ skipping 86 matching lines @@
 #error "Unknown / unsupported CPU architecture."
 #endif
     CHECK(irt_url.is_valid()) << "Cannot resolve IRT URL";
 
     irt_fp_ = TempFileForURL(url_loader, irt_url);
     CHECK(irt_fp_) << "Could not acquire the IRT";
   }
 
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) override {
-    connection->GetServiceProviderImpl().AddService<mojo::ContentHandler>(
+      mojo::ServiceProviderImpl* service_provider_impl) override {
+    service_provider_impl->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());
@@ skipping 30 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);
 }