ui/ozone/platform/drm/gpu/screen_manager_unittest.cc - Issue 1528373002: Replace Pass() with std::move in ui/ozone

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

Issue 1528373002: Replace Pass() with std::move in ui/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/caca/ozone_platform_caca.cc ('K') | « ui/ozone/platform/drm/gpu/screen_manager.cc ('k') | ui/ozone/platform/drm/host/drm_device_handle.cc » ('j') | ui/ozone/platform/drm/ozone_platform_gbm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/ozone/platform/drm/gpu/screen_manager_unittest.cc

diff --git a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc

index 141b7e8bfd5d52c125d22d1bf4da7d2276b4d42b..66b3666e2b7cfefc3633a8c83e88c2397b8d7aff 100644

--- a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc

+++ b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc

@@ -375,7 +375,7 @@ TEST_F(ScreenManagerTest, CheckControllerToWindowMappingWithSameBounds) {

new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get()));

window->Initialize();

window->SetBounds(GetPrimaryBounds());

- screen_manager_->AddWindow(1, window.Pass());

+ screen_manager_->AddWindow(1, std::move(window));

screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);

screen_manager_->ConfigureDisplayController(

@@ -395,7 +395,7 @@ TEST_F(ScreenManagerTest, CheckControllerToWindowMappingWithDifferentBounds) {

gfx::Rect new_bounds = GetPrimaryBounds();

new_bounds.Inset(0, 0, 1, 1);

window->SetBounds(new_bounds);

- screen_manager_->AddWindow(1, window.Pass());

+ screen_manager_->AddWindow(1, std::move(window));

screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);

screen_manager_->ConfigureDisplayController(

@@ -416,7 +416,7 @@ TEST_F(ScreenManagerTest,

new ui::DrmWindow(i, device_manager_.get(), screen_manager_.get()));

window->Initialize();

window->SetBounds(GetPrimaryBounds());

- screen_manager_->AddWindow(i, window.Pass());

+ screen_manager_->AddWindow(i, std::move(window));

}

screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);

@@ -441,7 +441,7 @@ TEST_F(ScreenManagerTest, ShouldDissociateWindowOnControllerRemoval) {

window_id, device_manager_.get(), screen_manager_.get()));

window->Initialize();

window->SetBounds(GetPrimaryBounds());

- screen_manager_->AddWindow(window_id, window.Pass());

+ screen_manager_->AddWindow(window_id, std::move(window));

screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);

screen_manager_->ConfigureDisplayController(

@@ -463,7 +463,7 @@ TEST_F(ScreenManagerTest, EnableControllerWhenWindowHasNoBuffer) {

new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get()));

window->Initialize();

window->SetBounds(GetPrimaryBounds());

- screen_manager_->AddWindow(1, window.Pass());

+ screen_manager_->AddWindow(1, std::move(window));

screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);

screen_manager_->ConfigureDisplayController(

@@ -497,7 +497,7 @@ TEST_F(ScreenManagerTest, EnableControllerWhenWindowHasBuffer) {

window->SchedulePageFlip(

std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(buffer)),

base::Bind(&EmptySwapCallback));

- screen_manager_->AddWindow(1, window.Pass());

+ screen_manager_->AddWindow(1, std::move(window));

screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);

screen_manager_->ConfigureDisplayController(