ApplicationConnection devolution, part 3.

shell/android/native_viewport_application_loader.cc

Index: shell/android/native_viewport_application_loader.cc
diff --git a/shell/android/native_viewport_application_loader.cc b/shell/android/native_viewport_application_loader.cc
index 359f004383f0a6f38805c3b023ad4b9d968af060..36e364b694a718962a53e576e1842eb67f3492a3 100644
--- a/shell/android/native_viewport_application_loader.cc
+++ b/shell/android/native_viewport_application_loader.cc
@@ -28,8 +28,8 @@ void NativeViewportApplicationLoader::Load(
 }
 
 bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
-    ApplicationConnection* connection) {
-  connection->GetServiceProviderImpl().AddService<mojo::NativeViewport>(
+    mojo::ServiceProviderImpl* service_provider_impl) {
+  service_provider_impl->AddService<mojo::NativeViewport>(
       [this](const ConnectionContext& connection_context,
              InterfaceRequest<mojo::NativeViewport> native_viewport_request) {
         if (!gpu_state_)
@@ -37,7 +37,7 @@ bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
         new native_viewport::NativeViewportImpl(app_.get(), false, gpu_state_,
                                                 native_viewport_request.Pass());
       });
-  connection->GetServiceProviderImpl().AddService<mojo::Gpu>(
+  service_provider_impl->AddService<mojo::Gpu>(
       [this](const ConnectionContext& connection_context,
              InterfaceRequest<mojo::Gpu> gpu_request) {
         if (!gpu_state_)