ApplicationConnection devolution, part 3.

mojo/ui/content_viewer_app.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 "mojo/ui/content_viewer_app.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 
 namespace mojo {
@@ skipping 30 matching lines @@
   app_impl_ = app_impl;
 
   auto command_line = base::CommandLine::ForCurrentProcess();
   command_line->InitFromArgv(app_impl_->args());
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
 }
 
 bool ContentViewerApp::ConfigureIncomingConnection(
-    mojo::ApplicationConnection* connection) {
-  connection->GetServiceProviderImpl().AddService<ContentHandler>([this](
+    ServiceProviderImpl* service_provider_impl) {
+  service_provider_impl->AddService<ContentHandler>([this](
       const ConnectionContext& connection_context,
       InterfaceRequest<ContentHandler> content_handler_request) {
     bindings_.AddBinding(
         new DelegatingContentHandler(this, connection_context.connection_url),
         content_handler_request.Pass());
   });
   return true;
 }
 
 void ContentViewerApp::StartViewer(
     const std::string& content_handler_url,
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
   ViewProviderApp* app = LoadContent(content_handler_url, response.Pass());
   if (app)
     new mojo::ApplicationImpl(app, application_request.Pass());
 }
 
 }  // namespace ui
 }  // namespace mojo