Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(861)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/ozone/platform/dri/hardware_display_controller_unittest.cc

Issue 402773002: [Ozone-DRI] Removing MockDriSurface implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/ozone/platform/dri/dri_surface_unittest.cc ('K') | « ui/ozone/platform/dri/dri_wrapper.cc ('k') | ui/ozone/platform/dri/test/mock_dri_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16b2dabd5190b998caf2b6df0cd92211c4304b62..0aa2fde22d205ecc34a4421cfa551d095762470e 100644
--- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
@@ -8,7 +8,6 @@
#include "ui/ozone/platform/dri/dri_surface.h"
#include "ui/ozone/platform/dri/dri_wrapper.h"
#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/test/mock_dri_surface.h"
#include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
#include "ui/ozone/public/native_pixmap.h"
@@ -50,7 +49,7 @@ void HardwareDisplayControllerTest::TearDown() {
TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) {
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
@@ -60,7 +59,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) {
TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
@@ -74,7 +73,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateIfModesetFails) {
drm_->set_set_crtc_expectation(false);
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_FALSE(controller_->BindSurfaceToController(surface.Pass(),
@@ -86,7 +85,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateIfPageFlipFails) {
drm_->set_page_flip_expectation(false);
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
@@ -97,7 +96,7 @@ TEST_F(HardwareDisplayControllerTest, CheckStateIfPageFlipFails) {
TEST_F(HardwareDisplayControllerTest, VerifyNoDRMCallsWhenDisabled) {
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
@@ -107,7 +106,7 @@ TEST_F(HardwareDisplayControllerTest, VerifyNoDRMCallsWhenDisabled) {
std::vector<ui::OzoneOverlayPlane>(), NULL));
EXPECT_EQ(0, drm_->get_page_flip_call_count());
- surface.reset(new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ surface.reset(new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
@@ -119,9 +118,9 @@ TEST_F(HardwareDisplayControllerTest, VerifyNoDRMCallsWhenDisabled) {
TEST_F(HardwareDisplayControllerTest, CheckOverlayMainSurfaceReplacement) {
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
scoped_ptr<ui::ScanoutSurface> overlay(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(
@@ -144,9 +143,9 @@ TEST_F(HardwareDisplayControllerTest, CheckOverlayMainSurfaceReplacement) {
TEST_F(HardwareDisplayControllerTest, CheckOverlayPresent) {
scoped_ptr<ui::ScanoutSurface> surface(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
scoped_ptr<ui::ScanoutSurface> overlay(
- new ui::MockDriSurface(drm_.get(), kDefaultModeSize));
+ new ui::DriSurface(drm_.get(), kDefaultModeSize));
EXPECT_TRUE(surface->Initialize());
EXPECT_TRUE(
« ui/ozone/platform/dri/dri_surface_unittest.cc ('K') | « ui/ozone/platform/dri/dri_wrapper.cc ('k') | ui/ozone/platform/dri/test/mock_dri_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698