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

ui/ozone/platform/dri/test/mock_dri_wrapper.cc

 // Copyright 2014 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 "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
 #include "base/logging.h"
@@ skipping 40 matching lines @@
       set_crtc_expectation_(true),
       add_framebuffer_expectation_(true),
       page_flip_expectation_(true),
       create_dumb_buffer_expectation_(true),
       current_framebuffer_(0) {
   fd_ = fd;
   plane_manager_.reset(new HardwareDisplayPlaneManagerLegacy());
 }
 
 MockDriWrapper::MockDriWrapper(int fd,
-                               bool software_mode,
+                               bool use_sync_flips,
                                std::vector<uint32_t> crtcs,
                                size_t planes_per_crtc)
-    : DriWrapper("", software_mode),
+    : DriWrapper("", use_sync_flips),
       get_crtc_call_count_(0),
       set_crtc_call_count_(0),
       restore_crtc_call_count_(0),
       add_framebuffer_call_count_(0),
       remove_framebuffer_call_count_(0),
       page_flip_call_count_(0),
       overlay_flip_call_count_(0),
       set_crtc_expectation_(true),
       add_framebuffer_expectation_(true),
       page_flip_expectation_(true),
@@ skipping 57 matching lines @@
 ScopedDrmFramebufferPtr MockDriWrapper::GetFramebuffer(uint32_t framebuffer) {
   return ScopedDrmFramebufferPtr();
 }
 
 bool MockDriWrapper::PageFlip(uint32_t crtc_id,
                               uint32_t framebuffer,
                               const PageFlipCallback& callback) {
   page_flip_call_count_++;
   current_framebuffer_ = framebuffer;
   if (page_flip_expectation_) {
-    if (software_mode_)
+    if (use_sync_flips_)
       callback.Run(0, 0, 0);
     else
       callbacks_.push(callback);
   }
 
   return page_flip_expectation_;
 }
 
 bool MockDriWrapper::PageFlipOverlay(uint32_t crtc_id,
                                      uint32_t framebuffer,
@@ skipping 61 matching lines @@
 
 void MockDriWrapper::RunCallbacks() {
   while (!callbacks_.empty()) {
     PageFlipCallback callback = callbacks_.front();
     callbacks_.pop();
     callback.Run(0, 0, 0);
   }
 }
 
 }  // namespace ui