Centralize FrameSinkId allocation in one place

content/browser/renderer_host/context_provider_factory_impl_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_
 
 #include <queue>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
+#include "cc/surfaces/frame_sink_id_allocator.h"
 #include "content/common/content_export.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "services/ui/public/cpp/gpu/command_buffer_metrics.h"
 #include "ui/android/context_provider_factory.h"
 
 namespace gpu {
 class GpuChannelHost;
 class GpuChannelEstablishFactory;
@@ skipping 74 matching lines @@
 
   scoped_refptr<cc::VulkanContextProvider> shared_vulkan_context_provider_;
 
   bool in_handle_pending_requests_;
 
   bool in_shutdown_;
 
   base::OneShotTimer establish_gpu_channel_timeout_;
 
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  uint32_t next_sink_id_;
+  cc::FrameSinkIdAllocator frame_sink_id_allocator_;
 
   base::WeakPtrFactory<ContextProviderFactoryImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextProviderFactoryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_