Create //components/viz/frame_sinks and move code.

services/ui/gpu/gpu_main.h

Index: services/ui/gpu/gpu_main.h
diff --git a/services/ui/gpu/gpu_main.h b/services/ui/gpu/gpu_main.h
index 1e839880c3ce4623838203582bbfeb933b5b204f..005c6d526c30d488a3d34802a9359f59101c2a0b 100644
--- a/services/ui/gpu/gpu_main.h
+++ b/services/ui/gpu/gpu_main.h
@@ -9,16 +9,20 @@
 #include "base/threading/thread.h"
 #include "gpu/ipc/in_process_command_buffer.h"
 #include "gpu/ipc/service/gpu_init.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
-#include "services/ui/surfaces/display_provider.h"
-#include "services/ui/surfaces/mojo_frame_sink_manager.h"
 
 namespace gpu {
 class GpuMemoryBufferFactory;
 class ImageFactory;
 }
 
+namespace viz {
+class DisplayProvider;
+class MojoFrameSinkManager;
+}
+
 namespace ui {
 
 class GpuService;
@@ -85,8 +89,8 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
       pending_frame_sink_manager_client_info_;
 
   // Provides mojo interfaces for creating and managing FrameSinks.
-  std::unique_ptr<MojoFrameSinkManager> frame_sink_manager_;
-  std::unique_ptr<DisplayProvider> display_provider_;
+  std::unique_ptr<viz::MojoFrameSinkManager> frame_sink_manager_;
+  std::unique_ptr<viz::DisplayProvider> display_provider_;
 
   std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;