Pass application ids via AcceptConnection & ConnectToApplication callback.

components/bitmap_uploader/bitmap_uploader.cc

 // Copyright 2015 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 "components/bitmap_uploader/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 
 namespace bitmap_uploader {
 namespace {
 
 const uint32_t g_transparent_color = 0x00000000;
 
 void LostContext(void*) {
   // TODO(fsamuel): Figure out if there's something useful to do here.
 }
 
-void OnGotContentHandlerID(uint32_t content_handler_id) {}
+void OnGotRemoteIDs(uint32_t remote_id, uint32_t content_handler_id) {}
 
 }  // namespace
 
 const char kBitmapUploaderForAcceleratedWidget[] =
     "__BITMAP_UPLOADER_ACCELERATED_WIDGET__";
 
 BitmapUploader::BitmapUploader(mus::Window* window)
     : window_(window),
       color_(g_transparent_color),
       width_(0),
@@ skipping 11 matching lines @@
 void BitmapUploader::Init(mojo::Shell* shell) {
   surface_ = window_->RequestSurface(mus::mojom::SURFACE_TYPE_DEFAULT);
   surface_->BindToThread();
 
   mojo::ServiceProviderPtr gpu_service_provider;
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:mus");
   shell->ConnectToApplication(std::move(request2),
                               mojo::GetProxy(&gpu_service_provider), nullptr,
                               mojo::CreatePermissiveCapabilityFilter(),
-                              base::Bind(&OnGotContentHandlerID));
+                              base::Bind(&OnGotRemoteIDs));
   ConnectToService(gpu_service_provider.get(), &gpu_service_);
 
   mus::mojom::CommandBufferPtr gles2_client;
   gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
   gles2_context_ = MojoGLES2CreateContext(
       gles2_client.PassInterface().PassHandle().release().value(),
       nullptr,
       &LostContext, nullptr, mojo::Environment::GetDefaultAsyncWaiter());
   MojoGLES2MakeCurrent(gles2_context_);
 }
@@ skipping 182 matching lines @@
     glWaitSyncTokenCHROMIUM(
         resource->sync_token.To<gpu::SyncToken>().GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource->id);
     glDeleteTextures(1, &texture_id);
   }
 }
 
 }  // namespace bitmap_uploader