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

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

Issue 908993003: [Ozone-Dri] Rename DriWrapper to DrmDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udl3-pass-drm-fd
Patch Set: rebased Created 5 years, 10 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
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 6a20ac12134ec7113024c11895d08f668bbe5801..f63c1367585aeb419d2955f0931e79407df42b16 100644
--- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
@@ -7,9 +7,9 @@
#include "third_party/skia/include/core/SkCanvas.h"
#include "ui/ozone/platform/dri/crtc_controller.h"
#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/drm_device.h"
#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
+#include "ui/ozone/platform/dri/test/mock_drm_device.h"
#include "ui/ozone/public/native_pixmap.h"
namespace {
@@ -58,7 +58,7 @@ class HardwareDisplayControllerTest : public testing::Test {
protected:
scoped_ptr<ui::HardwareDisplayController> controller_;
- scoped_refptr<ui::MockDriWrapper> drm_;
+ scoped_refptr<ui::MockDrmDevice> drm_;
int page_flips_;
@@ -70,7 +70,7 @@ void HardwareDisplayControllerTest::SetUp() {
std::vector<uint32_t> crtcs;
crtcs.push_back(kPrimaryCrtc);
crtcs.push_back(kSecondaryCrtc);
- drm_ = new ui::MockDriWrapper(false, crtcs, kPlanesPerCrtc);
+ drm_ = new ui::MockDrmDevice(false, crtcs, kPlanesPerCrtc);
controller_.reset(new ui::HardwareDisplayController(
scoped_ptr<ui::CrtcController>(new ui::CrtcController(
drm_.get(), kPrimaryCrtc, kPrimaryConnector))));
« no previous file with comments | « ui/ozone/platform/dri/hardware_display_controller.cc ('k') | ui/ozone/platform/dri/hardware_display_plane.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698