Mus+Ash: Fix the FrameSinkId of the FrameGenerator's CompositorFrameSink

services/ui/surfaces/compositor_frame_sink.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 "services/ui/surfaces/compositor_frame_sink.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/surfaces/direct_output_surface.h"
 #include "services/ui/surfaces/surfaces_context_provider.h"
 
 #if defined(USE_OZONE)
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/surfaces/direct_output_surface_ozone.h"
 #endif
 
 namespace ui {
 namespace surfaces {
 
 CompositorFrameSink::CompositorFrameSink(
+    const cc::FrameSinkId& frame_sink_id,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     gfx::AcceleratedWidget widget,
     scoped_refptr<gpu::GpuChannelHost> gpu_channel,
     const scoped_refptr<DisplayCompositor>& display_compositor)
-    : frame_sink_id_(display_compositor->GenerateNextClientId(), 0),
+    : frame_sink_id_(frame_sink_id),
       task_runner_(task_runner),
       display_compositor_(display_compositor),
       factory_(frame_sink_id_, display_compositor->manager(), this) {
   display_compositor_->manager()->RegisterFrameSinkId(frame_sink_id_);
   display_compositor_->manager()->RegisterSurfaceFactoryClient(frame_sink_id_,
                                                                this);
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       gpu_channel->gpu_memory_buffer_manager();
   scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
@@ skipping 88 matching lines @@
 }
 
 void CompositorFrameSink::DisplayDidDrawAndSwap() {
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from the DrawCallback when the surface is going to
   // be drawn.
 }
 
 }  // namespace surfaces
 }  // namespace ui