Decouple GpuCompositorFrameSink from DisplayCompositor

components/display_compositor/gpu_compositor_frame_sink.h

Index: components/display_compositor/gpu_compositor_frame_sink.h
diff --git a/services/ui/surfaces/gpu_compositor_frame_sink.h b/components/display_compositor/gpu_compositor_frame_sink.h
similarity index 74%
rename from services/ui/surfaces/gpu_compositor_frame_sink.h
rename to components/display_compositor/gpu_compositor_frame_sink.h
index bfe1e9ad240b189864af28f7d869a7b0f9488514..52bb1af40f56093f586c555249a0936470a73081 100644
--- a/services/ui/surfaces/gpu_compositor_frame_sink.h
+++ b/components/display_compositor/gpu_compositor_frame_sink.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
-#define SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
+#ifndef COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_
+#define COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_
 
 #include <memory>
 #include <vector>
@@ -15,24 +15,25 @@
 #include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/referenced_surface_tracker.h"
+#include "components/display_compositor/display_compositor_export.h"
+#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace cc {
 class Display;
 }
 
-namespace ui {
-
-class DisplayCompositor;
+namespace display_compositor {
 
 // Server side representation of a WindowSurface.
-class GpuCompositorFrameSink
-    : public cc::CompositorFrameSinkSupportClient,
-      public cc::mojom::MojoCompositorFrameSink,
-      public cc::mojom::MojoCompositorFrameSinkPrivate {
+class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
+    : public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient),
+      public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink),
+      public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate) {
  public:
   GpuCompositorFrameSink(
-      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,
@@ -59,8 +60,9 @@ class GpuCompositorFrameSink
   void OnClientConnectionLost();
   void OnPrivateConnectionLost();
 
-  DisplayCompositor* const display_compositor_;
+  GpuCompositorFrameSinkDelegate* const delegate_;
   cc::CompositorFrameSinkSupport support_;
+  cc::SurfaceManager* const surface_manager_;
 
  private:
   // cc::CompositorFrameSinkSupportClient implementation:
@@ -83,6 +85,6 @@ class GpuCompositorFrameSink
   DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink);
 };
 
-}  // namespace ui
+}  // namespace display_compositor
 
-#endif  // SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
+#endif  // COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_