GBM Ozone implementation

ui/ozone/platform/dri/hardware_display_controller_unittest.cc

Index: ui/ozone/platform/dri/hardware_display_controller_unittest.cc
diff --git a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
index 9a3e5dcafe7e30335247aa98f9c50df537098c2e..37ea856e6103abb432721c2a9218cedc82de70ed 100644
--- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
@@ -47,7 +47,7 @@ void HardwareDisplayControllerTest::TearDown() {
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) {
-  scoped_ptr<ui::DriSurface> surface(
+  scoped_ptr<ui::ScanoutSurface> surface(
       new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());
@@ -57,7 +57,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) {
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
-  scoped_ptr<ui::DriSurface> surface(
+  scoped_ptr<ui::ScanoutSurface> surface(
       new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());
@@ -70,7 +70,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
 TEST_F(HardwareDisplayControllerTest, CheckStateIfModesetFails) {
   drm_->set_set_crtc_expectation(false);
 
-  scoped_ptr<ui::DriSurface> surface(
+  scoped_ptr<ui::ScanoutSurface> surface(
       new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());
@@ -82,7 +82,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateIfModesetFails) {
 TEST_F(HardwareDisplayControllerTest, CheckStateIfPageFlipFails) {
   drm_->set_page_flip_expectation(false);
 
-  scoped_ptr<ui::DriSurface> surface(
+  scoped_ptr<ui::ScanoutSurface> surface(
       new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());