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

services/ui/surfaces/compositor_frame_sink.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 SERVICES_UI_SURFACES_COMPOSITOR_FRAME_SINK_H_
 #define SERVICES_UI_SURFACES_COMPOSITOR_FRAME_SINK_H_
 
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
@@ skipping 15 matching lines @@
 
 // TODO(fsamuel): This should become a mojo interface for the mus-gpu split.
 // TODO(fsamuel): This should not be a SurfaceFactoryClient.
 // The CompositorFrameSink receives CompositorFrames from all sources,
 // creates a top-level CompositorFrame once per tick, and generates graphical
 // output.
 class CompositorFrameSink : public cc::SurfaceFactoryClient,
                             public cc::DisplayClient {
  public:
   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);
   ~CompositorFrameSink() override;
 
   // CompositorFrameSink embedders submit a CompositorFrame when content on the
   // display should be changed. A well-behaving embedder should only submit
   // a CompositorFrame once per BeginFrame tick. The callback is called the
   // first time this frame is used to draw, or if the frame is discarded.
@@ skipping 33 matching lines @@
 
   gfx::Size display_size_;
   std::unique_ptr<cc::Display> display_;
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
 };
 
 }  // nanmespace surfaces
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_COMPOSITOR_FRAME_SINK_H_