Let DelegateFrameHost in Mac and Android use correct FrameSinkId during creation

ui/compositor/test/in_process_context_factory.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 "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 109 matching lines @@
 
 struct InProcessContextFactory::PerCompositorData {
   gpu::SurfaceHandle surface_handle = gpu::kNullSurfaceHandle;
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source;
   std::unique_ptr<cc::Display> display;
 };
 
 InProcessContextFactory::InProcessContextFactory(
     bool context_factory_for_test,
     cc::SurfaceManager* surface_manager)
-    : next_surface_client_id_(1u),
+    : next_surface_sink_id_(1u),
       use_test_surface_(true),
       context_factory_for_test_(context_factory_for_test),
       surface_manager_(surface_manager) {
   DCHECK(surface_manager);
   DCHECK_NE(gl::GetGLImplementation(), gl::kGLImplementationNone)
       << "If running tests, ensure that main() is calling "
       << "gl::GLSurfaceTestSupport::InitializeOneOff()";
 }
 
 InProcessContextFactory::~InProcessContextFactory() {
@@ skipping 133 matching lines @@
 gpu::GpuMemoryBufferManager*
 InProcessContextFactory::GetGpuMemoryBufferManager() {
   return &gpu_memory_buffer_manager_;
 }
 
 cc::TaskGraphRunner* InProcessContextFactory::GetTaskGraphRunner() {
   return &task_graph_runner_;
 }
 
 cc::FrameSinkId InProcessContextFactory::AllocateFrameSinkId() {
-  return cc::FrameSinkId(next_surface_client_id_++, 0);
+  // The FrameSinkId generated here must be unique with
+  // RenderWidgetHostViewAura's
+  // and RenderWidgetHostViewMac's FrameSinkId allocation.
+  // TODO(crbug.com/685777): Centralize allocation in one place for easier
+  // maintenance.
+  return cc::FrameSinkId(0, next_surface_sink_id_++);
 }
 
 cc::SurfaceManager* InProcessContextFactory::GetSurfaceManager() {
   return surface_manager_;
 }
 
 void InProcessContextFactory::SetDisplayVisible(ui::Compositor* compositor,
                                                 bool visible) {
   if (!per_compositor_data_.count(compositor))
     return;
@@ skipping 32 matching lines @@
     data->surface_handle = tracker->AddSurfaceForNativeWidget(widget);
 #endif
   }
 
   PerCompositorData* return_ptr = data.get();
   per_compositor_data_[compositor] = std::move(data);
   return return_ptr;
 }
 
 }  // namespace ui