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 d809b9bb9a42215a1a66aecb1e7cb408bdc462db..4643fedb7776577cbb890d7487b6e1906423e745 100644 |
--- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc |
+++ b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc |
@@ -65,7 +65,8 @@ class MockDriWrapper : public ui::DriWrapper { |
return true; |
} |
- virtual bool AddFramebuffer(const drmModeModeInfo& mode, |
+ virtual bool AddFramebuffer(uint32_t width, |
+ uint32_t height, |
uint8_t depth, |
uint8_t bpp, |
uint32_t stride, |
@@ -226,24 +227,9 @@ TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) { |
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(), |
kDefaultMode)); |
- EXPECT_EQ(2, drm_->get_add_framebuffer_call_count()); |
EXPECT_TRUE(controller_->get_surface() != NULL); |
} |
-TEST_F(HardwareDisplayControllerTest, CheckStateIfBindingFails) { |
- drm_->set_add_framebuffer_expectation(false); |
- |
- scoped_ptr<ui::DriSurface> surface( |
- new MockDriSurface(drm_.get(), kDefaultModeSize)); |
- |
- EXPECT_TRUE(surface->Initialize()); |
- EXPECT_FALSE(controller_->BindSurfaceToController(surface.Pass(), |
- kDefaultMode)); |
- |
- EXPECT_EQ(1, drm_->get_add_framebuffer_call_count()); |
- EXPECT_EQ(NULL, controller_->get_surface()); |
-} |
- |
TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) { |
scoped_ptr<ui::DriSurface> surface( |
new MockDriSurface(drm_.get(), kDefaultModeSize)); |
@@ -279,17 +265,3 @@ TEST_F(HardwareDisplayControllerTest, CheckStateIfPageFlipFails) { |
kDefaultMode)); |
EXPECT_FALSE(controller_->SchedulePageFlip()); |
} |
- |
-TEST_F(HardwareDisplayControllerTest, CheckProperDestruction) { |
- scoped_ptr<ui::DriSurface> surface( |
- new MockDriSurface(drm_.get(), kDefaultModeSize)); |
- |
- EXPECT_TRUE(surface->Initialize()); |
- EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(), |
- kDefaultMode)); |
- EXPECT_TRUE(controller_->get_surface() != NULL); |
- |
- controller_.reset(); |
- |
- EXPECT_EQ(2, drm_->get_remove_framebuffer_call_count()); |
-} |