Move DisplayCompositor code to new component.

services/ui/gpu/gpu_main.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_GPU_GPU_MAIN_H_
 #define SERVICES_UI_GPU_GPU_MAIN_H_
 
 #include "base/threading/thread.h"
+#include "components/frame_sinks/display_compositor.h"
 #include "gpu/ipc/in_process_command_buffer.h"
 #include "gpu/ipc/service/gpu_init.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
-#include "services/ui/surfaces/display_compositor.h"
 
 namespace gpu {
 class GpuMemoryBufferFactory;
 class ImageFactory;
 }
 
 namespace ui {
 
 class GpuService;
 
@@ skipping 51 matching lines @@
 
   // The InCommandCommandBuffer::Service used by the display compositor.
   scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_command_service_;
 
   // If the gpu service is not yet ready then we stash pending MessagePipes in
   // these member variables.
   cc::mojom::DisplayCompositorRequest pending_display_compositor_request_;
   cc::mojom::DisplayCompositorClientPtrInfo
       pending_display_compositor_client_info_;
 
-  std::unique_ptr<DisplayCompositor> display_compositor_;
+  std::unique_ptr<frame_sinks::DisplayCompositor> display_compositor_;
 
   std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
 
   // The main thread for Gpu.
   base::Thread gpu_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> gpu_thread_task_runner_;
 
   // The thread that handles IO events for Gpu.
   base::Thread io_thread_;
 
   // The display compositor gets its own thread in mus-gpu. The gpu service,
   // where GL commands are processed resides on its own thread. Various
   // components of the display compositor such as Display, ResourceProvider,
   // and GLRenderer block on sync tokens from other command buffers. Thus,
   // the gpu service must live on a separate thread.
   base::Thread compositor_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_task_runner_;
 
   mojo::Binding<mojom::GpuMain> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMain);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_MAIN_H_