ApplicationConnection devolution, part 3.

services/native_viewport/app_delegate.cc

 // Copyright 2014 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 "services/native_viewport/app_delegate.h"
 
 #include <vector>
 
 #include "gpu/config/gpu_util.h"
 
@@ skipping 42 matching lines @@
     gfx::GLSurface::InitializeOneOffForTests();
   else if (application->HasArg(mojo::kUseOSMesa))
     gfx::GLSurface::InitializeOneOff(gfx::kGLImplementationOSMesaGL);
   else
     gfx::GLSurface::InitializeOneOff();
 
   is_headless_ = application->HasArg(mojo::kUseHeadlessConfig);
 }
 
 bool NativeViewportAppDelegate::ConfigureIncomingConnection(
-    mojo::ApplicationConnection* connection) {
-  connection->GetServiceProviderImpl().AddService<mojo::NativeViewport>([this](
+    mojo::ServiceProviderImpl* service_provider_impl) {
+  service_provider_impl->AddService<mojo::NativeViewport>([this](
       const mojo::ConnectionContext& connection_context,
       mojo::InterfaceRequest<mojo::NativeViewport> native_viewport_request) {
     if (!gpu_state_.get())
       gpu_state_ = new gles2::GpuState();
     new NativeViewportImpl(application_, is_headless_, gpu_state_,
                            native_viewport_request.Pass());
   });
 
-  connection->GetServiceProviderImpl().AddService<mojo::Gpu>(
+  service_provider_impl->AddService<mojo::Gpu>(
       [this](const mojo::ConnectionContext& connection_context,
              mojo::InterfaceRequest<mojo::Gpu> gpu_request) {
         if (!gpu_state_.get())
           gpu_state_ = new gles2::GpuState();
         new gles2::GpuImpl(gpu_request.Pass(), gpu_state_);
       });
 
   return true;
 }
 
 }  // namespace native_viewport