Pass ServiceProvider and ServiceProvider& params in Connect

mojo/aura/surface_binding.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 "mojo/aura/surface_binding.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 189 matching lines @@
     delete view_map;
     view_states.Pointer()->Set(nullptr);
   }
 }
 
 void SurfaceBinding::PerViewManagerState::Init() {
   DCHECK(!surfaces_service_.get());
 
   ServiceProviderPtr surfaces_service_provider;
   shell_->ConnectToApplication("mojo:surfaces_service",
-                               GetProxy(&surfaces_service_provider));
+                               GetProxy(&surfaces_service_provider),
+                               ServiceProviderPtr());
   ConnectToService(surfaces_service_provider.get(), &surfaces_service_);
   // base::Unretained is ok here as we block until the call is received.
   surfaces_service_->CreateSurfaceConnection(
       base::Bind(&PerViewManagerState::OnCreatedSurfaceConnection,
                  base::Unretained(this)));
   // Block until we get the surface. This is done to make it easy for client
   // code. OTOH blocking is ick and leads to all sorts of problems.
   // TODO(sky): ick! There needs to be a better way to deal with this.
   surfaces_service_.WaitForIncomingMethodCall();
   DCHECK(surface_.get());
   surface_client_.reset(new SurfaceClientImpl);
   surface_.set_client(surface_client_.get());
 
   ServiceProviderPtr gpu_service_provider;
   // TODO(jamesr): Should be mojo:gpu_service
   shell_->ConnectToApplication("mojo:native_viewport_service",
-                               GetProxy(&gpu_service_provider));
+                               GetProxy(&gpu_service_provider),
+                               ServiceProviderPtr());
   ConnectToService(gpu_service_provider.get(), &gpu_);
 }
 
 void SurfaceBinding::PerViewManagerState::OnCreatedSurfaceConnection(
     SurfacePtr surface,
     uint32_t id_namespace) {
   surface_id_allocator_.reset(new cc::SurfaceIdAllocator(id_namespace));
   surface_ = surface.Pass();
 }
 
 // SurfaceBinding --------------------------------------------------------------
 
 SurfaceBinding::SurfaceBinding(Shell* shell, View* view)
     : view_(view),
       state_(PerViewManagerState::Get(shell, view->view_manager())) {
 }
 
 SurfaceBinding::~SurfaceBinding() {
 }
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(view_);
 }
 
 }  // namespace mojo