Switch DRM platform to using a separate thread

ui/ozone/platform/drm/ozone_platform_drm.cc

Index: ui/ozone/platform/drm/ozone_platform_drm.cc
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index 987f2fe61e5e4235b3514516a05c58922b1aaea2..de8094a3bb7c831315e464d211305fc94b700eac 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -12,15 +12,10 @@
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/ozone/platform/drm/common/drm_util.h"
-#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
-#include "ui/ozone/platform/drm/gpu/drm_device.h"
-#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
-#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
-#include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
-#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support_proxy.h"
 #include "ui/ozone/platform/drm/gpu/drm_surface_factory.h"
-#include "ui/ozone/platform/drm/gpu/drm_window.h"
-#include "ui/ozone/platform/drm/gpu/screen_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_thread.h"
+#include "ui/ozone/platform/drm/gpu/proxy_helpers.h"
 #include "ui/ozone/platform/drm/host/drm_cursor.h"
 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h"
 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
@@ -48,15 +43,12 @@ namespace {
 // anything). This means chrome alone owns the display and input devices.
 class OzonePlatformDrm : public OzonePlatform {
  public:
-  OzonePlatformDrm()
-      : buffer_generator_(new DrmBufferGenerator()),
-        screen_manager_(new ScreenManager(buffer_generator_.get())),
-        device_manager_(CreateDeviceManager()) {}
+  OzonePlatformDrm() : device_manager_(CreateDeviceManager()) {}
   ~OzonePlatformDrm() override {}
 
   // OzonePlatform:
   ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {
-    return surface_factory_ozone_.get();
+    return surface_factory_.get();
   }
   OverlayManagerOzone* GetOverlayManager() override {
     return overlay_manager_.get();
@@ -94,8 +86,6 @@ class OzonePlatformDrm : public OzonePlatform {
     return base::ScopedFD();
   }
   void InitializeUI() override {
-    drm_device_manager_.reset(new DrmDeviceManager(
-        scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
     window_manager_.reset(new DrmWindowHostManager());
     cursor_.reset(new DrmCursor(window_manager_.get()));
 #if defined(USE_XKBCOMMON)
@@ -109,12 +99,6 @@ class OzonePlatformDrm : public OzonePlatform {
         cursor_.get(), device_manager_.get(),
         KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
     overlay_manager_.reset(new DrmOverlayManager(false, nullptr));
-    surface_factory_ozone_.reset(new DrmSurfaceFactory(screen_manager_.get()));
-    scoped_ptr<DrmGpuDisplayManager> display_manager(new DrmGpuDisplayManager(
-        screen_manager_.get(), drm_device_manager_.get()));
-    gpu_platform_support_.reset(new DrmGpuPlatformSupport(
-        drm_device_manager_.get(), screen_manager_.get(),
-        buffer_generator_.get(), display_manager.Pass()));
     gpu_platform_support_host_.reset(
         new DrmGpuPlatformSupportHost(cursor_.get()));
     display_manager_.reset(new DrmDisplayHostManager(
@@ -122,6 +106,12 @@ class OzonePlatformDrm : public OzonePlatform {
         event_factory_ozone_->input_controller()));
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
 
+    drm_thread_.reset(new DrmThread());
+    drm_thread_->Start();
+
+    surface_factory_.reset(new DrmSurfaceFactory(drm_thread_.get()));
+    gpu_platform_support_ = drm_thread_->CreateGpuPlatformSupportProxy();
+
     if (!gpu_helper_.Initialize(base::ThreadTaskRunnerHandle::Get(),
                                 base::ThreadTaskRunnerHandle::Get()))
       LOG(FATAL) << "Failed to initialize dummy channel.";
@@ -131,10 +121,9 @@ class OzonePlatformDrm : public OzonePlatform {
 
  private:
   // Objects in the "GPU" process.
-  scoped_ptr<DrmDeviceManager> drm_device_manager_;
-  scoped_ptr<DrmBufferGenerator> buffer_generator_;
-  scoped_ptr<ScreenManager> screen_manager_;
-  scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
+  scoped_ptr<DrmThread> drm_thread_;
+  scoped_ptr<DrmSurfaceFactory> surface_factory_;
+  scoped_ptr<DrmGpuPlatformSupportProxy> gpu_platform_support_;
 
   // Objects in the "Browser" process.
   scoped_ptr<OverlayManagerOzone> overlay_manager_;
@@ -151,8 +140,6 @@ class OzonePlatformDrm : public OzonePlatform {
 #endif
 
   // Objects on both processes.
-  scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_;
-
   OzoneGpuTestHelper gpu_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm);