Move DisplayCompositor code to new component.

components/frame_sinks/display_compositor.h

Index: components/frame_sinks/display_compositor.h
diff --git a/services/ui/surfaces/display_compositor.h b/components/frame_sinks/display_compositor.h
similarity index 86%
rename from services/ui/surfaces/display_compositor.h
rename to components/frame_sinks/display_compositor.h
index 260c1f4fcae0a808c0cbaa17eeaa71d06d25de77..67aba2b96dd4e2ee5840c9568a9f253038fc3107 100644
--- a/services/ui/surfaces/display_compositor.h
+++ b/components/frame_sinks/display_compositor.h
@@ -2,28 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
-#define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
-
-#include <stdint.h>
+#ifndef COMPONENTS_FRAME_SINKS_DISPLAY_COMPOSITOR_H_
+#define COMPONENTS_FRAME_SINKS_DISPLAY_COMPOSITOR_H_
 
 #include <memory>
 #include <unordered_map>
-#include <vector>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/ipc/display_compositor.mojom.h"
 #include "cc/surfaces/frame_sink_id.h"
-#include "cc/surfaces/local_surface_id.h"
-#include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_observer.h"
-#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"
+#include "components/frame_sinks/frame_sinks_export.h"
+#include "components/frame_sinks/gpu_compositor_frame_sink_delegate.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "gpu/ipc/in_process_command_buffer.h"
-#include "ipc/ipc_channel_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace gpu {
@@ -36,20 +31,14 @@ class Display;
 class SyntheticBeginFrameSource;
 }
 
-namespace display_compositor {
-class GpuCompositorFrameSink;
-}
-
-namespace ui {
+namespace frame_sinks {
 
 // The DisplayCompositor object is an object global to the Window Server app
 // that holds the SurfaceServer and allocates new Surfaces namespaces.
 // This object lives on the main thread of the Window Server.
-// TODO(rjkroege, fsamuel): This object will need to change to support multiple
-// displays.
-class DisplayCompositor
+class FRAME_SINKS_EXPORT DisplayCompositor
     : public cc::SurfaceObserver,
-      public display_compositor::GpuCompositorFrameSinkDelegate,
+      public GpuCompositorFrameSinkDelegate,
       public cc::mojom::DisplayCompositor {
  public:
   DisplayCompositor(
@@ -102,7 +91,7 @@ class DisplayCompositor
   void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                         bool* changed) override;
 
-  // display_compositor::GpuCompositorFrameSinkDelegate implementation.
+  // GpuCompositorFrameSinkDelegate implementation.
   void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id,
                               bool destroy_compositor_frame_sink) override;
   void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id,
@@ -132,6 +121,6 @@ class DisplayCompositor
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
-}  // namespace ui
+}  // namespace frame_sinks
 
-#endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
+#endif  //  COMPONENTS_FRAME_SINKS_DISPLAY_COMPOSITOR_H_