Introduce DisplayProvider for DisplayCompositor.

services/ui/gpu/gpu_main.cc

 // 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.
 
 #include "services/ui/gpu/gpu_main.h"
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "gpu/command_buffer/common/activity_flags.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/gpu_in_process_thread_service.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
 #include "services/ui/common/server_gpu_memory_buffer_manager.h"
 #include "services/ui/gpu/gpu_service.h"
+#include "services/ui/surfaces/mus_display_provider.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/message_loop/message_pump_mac.h"
 #endif
 
 namespace {
@@ skipping 178 matching lines @@
     gpu::ImageFactory* image_factory,
     mojom::GpuServicePtrInfo gpu_service_info,
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtrInfo client_info) {
   DCHECK(!display_compositor_);
   cc::mojom::DisplayCompositorClientPtr client;
   client.Bind(std::move(client_info));
 
   gpu_internal_.Bind(std::move(gpu_service_info));
 
+  display_provider_ = base::MakeUnique<MusDisplayProvider>(
+      gpu_command_service_,
+      base::MakeUnique<ServerGpuMemoryBufferManager>(gpu_internal_.get(),
+                                                     1 /* client_id */),
+      image_factory);
+
   display_compositor_ = base::MakeUnique<DisplayCompositor>(
-      gpu_command_service_, base::MakeUnique<ServerGpuMemoryBufferManager>(
-                                gpu_internal_.get(), 1 /* client_id */),
-      image_factory, std::move(request), std::move(client));
+      display_provider_.get(), std::move(request), std::move(client));
 }
 
 void GpuMain::TearDownOnCompositorThread() {
   display_compositor_.reset();
+  display_provider_.reset();
   gpu_internal_.reset();
 }
 
 void GpuMain::TearDownOnGpuThread() {
   gpu_service_.reset();
   gpu_memory_buffer_factory_.reset();
   gpu_init_.reset();
 }
 
 void GpuMain::CreateGpuServiceOnGpuThread(
@@ skipping 22 matching lines @@
   // TODO(sad): https://crbug.com/645602
 }
 
 bool GpuMain::EnsureSandboxInitialized(
     gpu::GpuWatchdogThread* watchdog_thread) {
   // TODO(sad): https://crbug.com/645602
   return true;
 }
 
 }  // namespace ui