Reland of "Decouple GpuCompositorFrameSink from DisplayCompositor"

components/display_compositor/gpu_display_compositor_frame_sink.cc

 // Copyright 2017 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/gpu_display_compositor_frame_sink.h"
+#include "components/display_compositor/gpu_display_compositor_frame_sink.h"
 
-namespace ui {
+namespace display_compositor {
 
 GpuDisplayCompositorFrameSink::GpuDisplayCompositorFrameSink(
-    DisplayCompositor* display_compositor,
+    GpuCompositorFrameSinkDelegate* delegate,
+    cc::SurfaceManager* surface_manager,
     const cc::FrameSinkId& frame_sink_id,
     std::unique_ptr<cc::Display> display,
     std::unique_ptr<cc::BeginFrameSource> begin_frame_source,
     cc::mojom::MojoCompositorFrameSinkAssociatedRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest
         compositor_frame_sink_private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::DisplayPrivateAssociatedRequest display_private_request)
-    : GpuCompositorFrameSink(display_compositor,
+    : GpuCompositorFrameSink(delegate,
+                             surface_manager,
                              frame_sink_id,
                              std::move(display),
                              std::move(begin_frame_source),
                              std::move(compositor_frame_sink_private_request),
                              std::move(client)),
       binding_(this, std::move(request)),
       display_private_binding_(this, std::move(display_private_request)) {
   binding_.set_connection_error_handler(
       base::Bind(&GpuDisplayCompositorFrameSink::OnClientConnectionLost,
                  base::Unretained(this)));
@@ skipping 15 matching lines @@
     const gfx::ColorSpace& color_space) {
   DCHECK(support_.display());
   support_.display()->SetColorSpace(color_space);
 }
 
 void GpuDisplayCompositorFrameSink::SetOutputIsSecure(bool secure) {
   DCHECK(support_.display());
   support_.display()->SetOutputIsSecure(secure);
 }
 
-}  // namespace ui
+}  // namespace display_compositor