Pass ServiceProvider and ServiceProvider& params in Connect

examples/bitmap_uploader/bitmap_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/bitmap_uploader/bitmap_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif  // GL_GLEXT_PROTOTYPES
 
@@ skipping 27 matching lines @@
       height_(0),
       format_(BGRA),
       next_resource_id_(1u),
       id_namespace_(0),
       weak_factory_(this) {
 }
 
 void BitmapUploader::Init(Shell* shell) {
   ServiceProviderPtr surfaces_service_provider;
   shell->ConnectToApplication("mojo:surfaces_service",
-                              GetProxy(&surfaces_service_provider));
+                              GetProxy(&surfaces_service_provider),
+                              ServiceProviderPtr());

[darin (slow to review), 2015/01/13 07:54:51]

note for a future CL: we could make nullptr work in these cases :)

   ConnectToService(surfaces_service_provider.get(), &surfaces_service_);
   ServiceProviderPtr gpu_service_provider;
   shell->ConnectToApplication("mojo:native_viewport_service",
-                              GetProxy(&gpu_service_provider));
+                              GetProxy(&gpu_service_provider),
+                              ServiceProviderPtr());
   ConnectToService(gpu_service_provider.get(), &gpu_service_);
 
   surfaces_service_->CreateSurfaceConnection(base::Bind(
       &BitmapUploader::OnSurfaceConnectionCreated, weak_factory_.GetWeakPtr()));
   CommandBufferPtr gles2_client;
   gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
   gles2_context_ =
       MojoGLES2CreateContext(gles2_client.PassMessagePipe().release().value(),
                              &LostContext,
                              NULL,
@@ skipping 206 matching lines @@
                0);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   return texture;
 }
 
 uint32_t BitmapUploader::TextureFormat() {
   return format_ == BGRA ? GL_BGRA_EXT : GL_RGBA;
 }
 
 }  // namespace mojo