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

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove HDCI stuff Created 5 years, 1 month 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/drm/gpu/hardware_display_controller_unittest.cc
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
index 812e943e558fa3b7a9304dc70a9ee2e1484a987e..6f1f065c3afa18d2c15c9aa513645bd8f1903c38 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
@@ -308,7 +308,7 @@ TEST_F(HardwareDisplayControllerTest, PlaneStateAfterRemoveCrtc) {
const ui::HardwareDisplayPlane* owned_plane = nullptr;
for (const auto& plane : drm_->plane_manager()->planes()) {
if (plane->in_use())
- owned_plane = plane;
+ owned_plane = plane.get();
}
ASSERT_TRUE(owned_plane != nullptr);
@@ -347,7 +347,7 @@ TEST_F(HardwareDisplayControllerTest, PlaneStateAfterDestroyingCrtc) {
const ui::HardwareDisplayPlane* owned_plane = nullptr;
for (const auto& plane : drm_->plane_manager()->planes())
if (plane->in_use())
- owned_plane = plane;
+ owned_plane = plane.get();
ASSERT_TRUE(owned_plane != nullptr);
EXPECT_EQ(kPrimaryCrtc, owned_plane->owning_crtc());
scoped_ptr<ui::CrtcController> crtc =
@@ -378,7 +378,7 @@ TEST_F(HardwareDisplayControllerTest, PlaneStateAfterAddCrtc) {
ui::HardwareDisplayPlane* primary_crtc_plane = nullptr;
for (const auto& plane : drm_->plane_manager()->planes()) {
if (plane->in_use() && kPrimaryCrtc == plane->owning_crtc())
- primary_crtc_plane = plane;
+ primary_crtc_plane = plane.get();
}
ASSERT_TRUE(primary_crtc_plane != nullptr);
« no previous file with comments | « ui/ozone/platform/drm/gpu/hardware_display_controller.cc ('k') | ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698