Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / ozone / platform / dri / dri_surface_unittest.cc

diff --git a/src/ui/ozone/platform/dri/dri_surface_unittest.cc b/src/ui/ozone/platform/dri/dri_surface_unittest.cc
index 0d64728..0e5c00e 100644 (file)
--- a/src/ui/ozone/platform/dri/dri_surface_unittest.cc
+++ b/src/ui/ozone/platform/dri/dri_surface_unittest.cc
@@ -7,7 +7,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
-#include "ui/ozone/platform/dri/crtc_state.h"
+#include "ui/ozone/platform/dri/crtc_controller.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
@@ -26,26 +26,24 @@ const uint32_t kDefaultConnector = 2;
 class MockDriWindowDelegate : public ui::DriWindowDelegate {
  public:
   MockDriWindowDelegate(ui::DriWrapper* drm) {
-    controller_.reset(new ui::HardwareDisplayController(
-        drm,
-        make_scoped_ptr(
-            new ui::CrtcState(drm, kDefaultCrtc, kDefaultConnector))));
+    controller_.reset(new ui::HardwareDisplayController(make_scoped_ptr(
+        new ui::CrtcController(drm, kDefaultCrtc, kDefaultConnector))));
     scoped_refptr<ui::DriBuffer> buffer(new ui::DriBuffer(drm));
     SkImageInfo info = SkImageInfo::MakeN32Premul(kDefaultMode.hdisplay,
                                                   kDefaultMode.vdisplay);
     EXPECT_TRUE(buffer->Initialize(info));
     EXPECT_TRUE(controller_->Modeset(ui::OverlayPlane(buffer), kDefaultMode));
   }
-  virtual ~MockDriWindowDelegate() {}
+  ~MockDriWindowDelegate() override {}
 
   // DriWindowDelegate:
-  virtual void Initialize() OVERRIDE {}
-  virtual void Shutdown() OVERRIDE {}
-  virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE { return 1; }
-  virtual ui::HardwareDisplayController* GetController() OVERRIDE {
+  void Initialize() override {}
+  void Shutdown() override {}
+  gfx::AcceleratedWidget GetAcceleratedWidget() override { return 1; }
+  ui::HardwareDisplayController* GetController() override {
     return controller_.get();
   }
-  virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE {}
+  void OnBoundsChanged(const gfx::Rect& bounds) override {}
 
  private:
   scoped_ptr<ui::HardwareDisplayController> controller_;
@@ -59,8 +57,8 @@ class DriSurfaceTest : public testing::Test {
  public:
   DriSurfaceTest() {}
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   scoped_ptr<base::MessageLoop> message_loop_;