[Ozone-Dri] Decouple the IO helper thread from DriWrapper

ui/ozone/platform/dri/dri_wrapper.cc

Index: ui/ozone/platform/dri/dri_wrapper.cc
diff --git a/ui/ozone/platform/dri/dri_wrapper.cc b/ui/ozone/platform/dri/dri_wrapper.cc
index 929dd27d8a45fd88f38269c6d35a38dac9530113..64ebf3c04c4ea4d51de3e2dc5f343571844ca34b 100644
--- a/ui/ozone/platform/dri/dri_wrapper.cc
+++ b/ui/ozone/platform/dri/dri_wrapper.cc
@@ -17,6 +17,7 @@
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
+#include "ui/ozone/platform/dri/dri_helper_thread.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h"
 
@@ -144,11 +145,8 @@ class DriWrapper::IOWatcher
   DISALLOW_COPY_AND_ASSIGN(IOWatcher);
 };
 
-DriWrapper::DriWrapper(const char* device_path, bool use_sync_flips)
-    : fd_(-1),
-      use_sync_flips_(use_sync_flips),
-      device_path_(device_path),
-      io_thread_("DriIOThread") {
+DriWrapper::DriWrapper(const char* device_path, DriHelperThread* helper_thread)
+    : fd_(-1), device_path_(device_path), helper_thread_(helper_thread) {
   plane_manager_.reset(new HardwareDisplayPlaneManagerLegacy());
 }
 
@@ -169,13 +167,10 @@ void DriWrapper::Initialize() {
 }
 
 void DriWrapper::InitializeIOWatcher() {
-  if (!use_sync_flips_ && !watcher_) {
-    if (!io_thread_.StartWithOptions(
-            base::Thread::Options(base::MessageLoop::TYPE_IO, 0)))
-      LOG(FATAL) << "Failed to start the IO helper thread";
+  DCHECK(helper_thread_->IsRunning());
 
-    watcher_ = new IOWatcher(fd_, io_thread_.task_runner());
-  }
+  if (!watcher_)
+    watcher_ = new IOWatcher(fd_, helper_thread_->task_runner());
 }
 
 ScopedDrmCrtcPtr DriWrapper::GetCrtc(uint32_t crtc_id) {
@@ -278,7 +273,7 @@ bool DriWrapper::PageFlip(uint32_t crtc_id,
                        payload.get())) {
     // If successful the payload will be removed by a PageFlip event.
     ignore_result(payload.release());
-    if (use_sync_flips_) {
+    if (!helper_thread_) {
       TRACE_EVENT1("dri", "OnDrmEvent", "socket", fd_);
 
       drmEventContext event;