Replace usage of SurfaceId's client_id with FrameSinkId

chrome/browser/android/blimp/chrome_compositor_dependencies.cc

 // Copyright 2016 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 "chrome/browser/android/blimp/chrome_compositor_dependencies.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "cc/output/context_provider.h"
 #include "content/public/common/content_switches.h"
@@ skipping 47 matching lines @@
 
 gpu::GpuMemoryBufferManager*
 ChromeCompositorDependencies::GetGpuMemoryBufferManager() {
   return context_provider_factory_->GetGpuMemoryBufferManager();
 }
 
 cc::SurfaceManager* ChromeCompositorDependencies::GetSurfaceManager() {
   return context_provider_factory_->GetSurfaceManager();
 }
 
-uint32_t ChromeCompositorDependencies::AllocateSurfaceClientId() {
-  return context_provider_factory_->AllocateSurfaceClientId();
+cc::FrameSinkId ChromeCompositorDependencies::AllocateFrameSinkId() {
+  return context_provider_factory_->AllocateFrameSinkId();
 }
 
 void ChromeCompositorDependencies::GetContextProviders(
     const ContextProviderCallback& callback) {
   context_provider_factory_->RequestGpuChannelHost(
       base::Bind(&ChromeCompositorDependencies::OnGpuChannelEstablished,
                  weak_factory_.GetWeakPtr(), callback));
 }
 
 void ChromeCompositorDependencies::OnGpuChannelEstablished(
@@ skipping 42 matching lines @@
             ui::ContextProviderFactory::ContextType::
                 BLIMP_RENDER_COMPOSITOR_CONTEXT,
             gpu::SharedMemoryLimits::ForMailboxContext(),
             GetOffscreenContextCreationAttributes(),
             false /* support_locking */, false /* automatic_flushes */,
             shared_context, std::move(gpu_channel_host));
   }
 
   callback.Run(compositor_context_provider, shared_main_thread_worker_context_);
 }