[Ozone-DRI] Re-enable GBM surface mode support

ui/ozone/platform/dri/dri_wrapper.h

Index: ui/ozone/platform/dri/dri_wrapper.h
diff --git a/ui/ozone/platform/dri/dri_wrapper.h b/ui/ozone/platform/dri/dri_wrapper.h
index 00f9e5dde0511d36cacc98309fddad8fc03e2f33..0dfa86691363cdc21a7fca32d84cc669ed4ef790 100644
--- a/ui/ozone/platform/dri/dri_wrapper.h
+++ b/ui/ozone/platform/dri/dri_wrapper.h
@@ -37,7 +37,7 @@ class DriWrapper {
                               unsigned int /* seconds */,
                               unsigned int /* useconds */)> PageFlipCallback;
 
-  DriWrapper(const char* device_path, bool software_mode);
+  DriWrapper(const char* device_path, bool use_sync_flips);
   virtual ~DriWrapper();
 
   // Open device.
@@ -163,10 +163,8 @@ class DriWrapper {
 
   scoped_ptr<HardwareDisplayPlaneManager> plane_manager_;
 
-  // If we're running in software mode this is true. In software mode we can't
-  // use the async page flip callbacks, so we need to block until the kernel
-  // responds to the page flip.
-  bool software_mode_;
+  // If we need to block when performing page flips this is set to true.
+  bool use_sync_flips_;
 
  private:
   class IOWatcher;