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

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

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRI_TEST_MOCK_DRI_WRAPPER_H_
 #define UI_OZONE_PLATFORM_DRI_TEST_MOCK_DRI_WRAPPER_H_
 
 #include <queue>
 #include <vector>
 
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 
 namespace ui {
 
 class CrtcController;
 
 // The real DriWrapper makes actual DRM calls which we can't use in unit tests.
 class MockDriWrapper : public ui::DriWrapper {
  public:
   MockDriWrapper(int fd);
   MockDriWrapper(int fd,
-                 bool software_mode,
+                 bool use_sync_flips,
                  std::vector<uint32_t> crtcs,
                  size_t planes_per_crtc);
   ~MockDriWrapper() override;
 
   int get_get_crtc_call_count() const { return get_crtc_call_count_; }
   int get_set_crtc_call_count() const { return set_crtc_call_count_; }
   int get_restore_crtc_call_count() const { return restore_crtc_call_count_; }
   int get_add_framebuffer_call_count() const {
     return add_framebuffer_call_count_;
   }
@@ skipping 86 matching lines @@
   std::vector<skia::RefPtr<SkSurface> > buffers_;
 
   std::queue<PageFlipCallback> callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDriWrapper);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_TEST_MOCK_DRI_WRAPPER_H_