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

services/ui/surfaces/compositor_frame_sink.cc

Index: services/ui/surfaces/compositor_frame_sink.cc
diff --git a/services/ui/surfaces/compositor_frame_sink.cc b/services/ui/surfaces/compositor_frame_sink.cc
index 2270d455b10bdd12397d0adb38647a79d937e73f..c880bd130d122447cedd8eeb369424f72e49433f 100644
--- a/services/ui/surfaces/compositor_frame_sink.cc
+++ b/services/ui/surfaces/compositor_frame_sink.cc
@@ -26,11 +26,12 @@ 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) {