Pass ServiceProvider and ServiceProvider& params in Connect

mojo/aura/surface_binding.cc

Index: mojo/aura/surface_binding.cc
diff --git a/mojo/aura/surface_binding.cc b/mojo/aura/surface_binding.cc
index 618db38246f7db8503b8d377ef0111d73dedbb90..38ecea01f57993d1f62d30ae490705d1c0d36a1d 100644
--- a/mojo/aura/surface_binding.cc
+++ b/mojo/aura/surface_binding.cc
@@ -207,7 +207,8 @@ void SurfaceBinding::PerViewManagerState::Init() {
 
   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(
@@ -224,7 +225,8 @@ void SurfaceBinding::PerViewManagerState::Init() {
   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_);
 }