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

Unified Diff: ash/display/extended_mouse_warp_controller_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: ash/display/extended_mouse_warp_controller_unittest.cc
diff --git a/ash/display/extended_mouse_warp_controller_unittest.cc b/ash/display/extended_mouse_warp_controller_unittest.cc
index 20aef5b199a6c85fd199bb33a2bf931fa70acc4a..2b52ad91e2543be76fc84010c5870ccd1b652d3e 100644
--- a/ash/display/extended_mouse_warp_controller_unittest.cc
+++ b/ash/display/extended_mouse_warp_controller_unittest.cc
@@ -62,7 +62,7 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnRight) {
gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- scoped_ptr<display::DisplayLayout> layout(
+ std::unique_ptr<display::DisplayLayout> layout(
test::CreateDisplayLayout(display::DisplayPlacement::RIGHT, 0));
display_manager->SetLayoutForCurrentDisplays(layout->Copy());
@@ -134,7 +134,7 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnLeft) {
gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- scoped_ptr<display::DisplayLayout> layout(
+ std::unique_ptr<display::DisplayLayout> layout(
test::CreateDisplayLayout(display::DisplayPlacement::LEFT, 0));
display_manager->SetLayoutForCurrentDisplays(layout->Copy());
@@ -175,7 +175,7 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnTopBottom) {
gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- scoped_ptr<display::DisplayLayout> layout(
+ std::unique_ptr<display::DisplayLayout> layout(
test::CreateDisplayLayout(display::DisplayPlacement::TOP, 0));
display_manager->SetLayoutForCurrentDisplays(layout->Copy());
event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);

Powered by Google App Engine
This is Rietveld 408576698