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

Unified Diff: ash/display/screen_position_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/screen_position_controller_unittest.cc
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index a4eeca655fa44b57a5cfb2d82dc5ea60b056b339..0ea3007e8351b053eb880d4627b485df6c875932 100644
--- a/ash/display/screen_position_controller_unittest.cc
+++ b/ash/display/screen_position_controller_unittest.cc
@@ -43,10 +43,10 @@ namespace test {
namespace {
void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
- scoped_ptr<display::DisplayLayout> layout(Shell::GetInstance()
- ->display_manager()
- ->GetCurrentDisplayLayout()
- .Copy());
+ std::unique_ptr<display::DisplayLayout> layout(Shell::GetInstance()
+ ->display_manager()
+ ->GetCurrentDisplayLayout()
+ .Copy());
layout->placement_list[0].position = position;
Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
std::move(layout));
@@ -86,7 +86,7 @@ class ScreenPositionControllerTest : public test::AshTestBase {
}
protected:
- scoped_ptr<aura::Window> window_;
+ std::unique_ptr<aura::Window> window_;
aura::test::TestWindowDelegate window_delegate_;
private:
@@ -341,7 +341,7 @@ TEST_F(ScreenPositionControllerTest,
Shell::GetInstance()->GetAllRootWindows();
aura::WindowTracker tracker;
tracker.Add(root_windows[1]);
- scoped_ptr<ConvertToScreenEventHandler> event_handler(
+ std::unique_ptr<ConvertToScreenEventHandler> event_handler(
new ConvertToScreenEventHandler);
// Remove the secondary monitor.

Powered by Google App Engine
This is Rietveld 408576698