Pass ServiceProvider and ServiceProvider& params in Connect

examples/ganesh_app/texture_uploader.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 "examples/ganesh_app/texture_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
@@ skipping 16 matching lines @@
                                  base::WeakPtr<mojo::GLContext> context)
     : client_(client),
       context_(context),
       next_resource_id_(0),
       id_namespace_(0),
       weak_factory_(this) {
   context_->AddObserver(this);
 
   mojo::ServiceProviderPtr surfaces_service_provider;
   shell->ConnectToApplication("mojo:surfaces_service",
-                              mojo::GetProxy(&surfaces_service_provider));
+                              mojo::GetProxy(&surfaces_service_provider),
+                              mojo::ServiceProviderPtr());
   mojo::ConnectToService(surfaces_service_provider.get(), &surfaces_service_);
 
   surfaces_service_->CreateSurfaceConnection(
       base::Bind(&TextureUploader::OnSurfaceConnectionCreated,
                  weak_factory_.GetWeakPtr()));
 }
 
 TextureUploader::~TextureUploader() {
   if (surface_id_)
     surface_->DestroySurface(surface_id_.Clone());
@@ skipping 120 matching lines @@
                                                  uint32_t id_namespace) {
   surface_ = surface.Pass();
   surface_.set_client(this);
   id_namespace_ = id_namespace;
 
   if (pending_upload_)
     Upload(pending_upload_.Pass());
 }
 
 }  // namespace examples