ApplicationConnection devolution, part 2.3.

shell/android/native_viewport_application_loader.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 "shell/android/native_viewport_application_loader.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "services/gles2/gpu_state.h"
 #include "services/native_viewport/native_viewport_impl.h"
 
@@ skipping 11 matching lines @@
 
 void NativeViewportApplicationLoader::Load(
     const GURL& url,
     InterfaceRequest<mojo::Application> application_request) {
   DCHECK(application_request.is_pending());
   app_.reset(new mojo::ApplicationImpl(this, application_request.Pass()));
 }
 
 bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
-  connection->AddService<mojo::NativeViewport>(this);
-  connection->AddService<mojo::Gpu>(this);
+  connection->GetServiceProviderImpl().AddService<mojo::NativeViewport>(
+      [this](const ConnectionContext& connection_context,
+             InterfaceRequest<mojo::NativeViewport> native_viewport_request) {
+        if (!gpu_state_)
+          gpu_state_ = new gles2::GpuState();
+        new native_viewport::NativeViewportImpl(app_.get(), false, gpu_state_,
+                                                native_viewport_request.Pass());
+      });
+  connection->GetServiceProviderImpl().AddService<mojo::Gpu>(
+      [this](const ConnectionContext& connection_context,
+             InterfaceRequest<mojo::Gpu> gpu_request) {
+        if (!gpu_state_)
+          gpu_state_ = new gles2::GpuState();
+        new gles2::GpuImpl(gpu_request.Pass(), gpu_state_);
+      });
   return true;
 }
 
-void NativeViewportApplicationLoader::Create(
-    const ConnectionContext& connection_context,
-    InterfaceRequest<mojo::NativeViewport> request) {
-  if (!gpu_state_)
-    gpu_state_ = new gles2::GpuState;
-  new native_viewport::NativeViewportImpl(app_.get(), false, gpu_state_,
-                                          request.Pass());
-}
-
-void NativeViewportApplicationLoader::Create(
-    const ConnectionContext& connection_context,
-    InterfaceRequest<mojo::Gpu> request) {
-  if (!gpu_state_)
-    gpu_state_ = new gles2::GpuState;
-  new gles2::GpuImpl(request.Pass(), gpu_state_);
-}
-
 }  // namespace shell