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

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: add #include <utility> 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
« no previous file with comments | « ui/ozone/platform/drm/gpu/screen_manager.cc ('k') | ui/ozone/platform/drm/host/drm_device_handle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..e50fc517d6d613a8d7029347717eaebaaac00454 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <utility>
+
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
@@ -375,7 +377,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 +397,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 +418,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 +443,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 +465,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 +499,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(
« no previous file with comments | « ui/ozone/platform/drm/gpu/screen_manager.cc ('k') | ui/ozone/platform/drm/host/drm_device_handle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698