Change InterfaceFactory<I>::Create() to take a ConnectionContext instead of an ApplicationConnectio…

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"
 
 namespace native_viewport {
@@ skipping 41 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(
-    ApplicationConnection* connection) {
-  connection->AddService<NativeViewport>(this);
-  connection->AddService<Gpu>(this);
+    mojo::ApplicationConnection* connection) {
+  connection->AddService<mojo::NativeViewport>(this);
+  connection->AddService<mojo::Gpu>(this);
   return true;
 }
 
 void NativeViewportAppDelegate::Create(
-    ApplicationConnection* connection,
-    mojo::InterfaceRequest<NativeViewport> request) {
+    const mojo::ConnectionContext& connection_context,
+    mojo::InterfaceRequest<mojo::NativeViewport> request) {
   if (!gpu_state_.get())
     gpu_state_ = new gles2::GpuState;
   new NativeViewportImpl(application_, is_headless_, gpu_state_,
                          request.Pass());
 }
 
-void NativeViewportAppDelegate::Create(ApplicationConnection* connection,
-                                       mojo::InterfaceRequest<Gpu> request) {
+void NativeViewportAppDelegate::Create(
+    const mojo::ConnectionContext& connection_context,
+    mojo::InterfaceRequest<mojo::Gpu> request) {
   if (!gpu_state_.get())
     gpu_state_ = new gles2::GpuState;
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
 }  // namespace native_viewport