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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/extended_desktop_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: address comments 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
« no previous file with comments | « ash/drag_drop/drag_image_view.h ('k') | ash/first_run/desktop_cleaner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index b42f2d44b88c4ed3f749ad93bf5f95fafdbd9ff3..e625eda079f3fcaae1c23561a57ae49f321071e0 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -35,7 +35,7 @@ namespace ash {
namespace {
void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
- scoped_ptr<display::DisplayLayout> layout =
+ std::unique_ptr<display::DisplayLayout> layout =
Shell::GetInstance()->display_manager()->GetCurrentDisplayLayout().Copy();
layout->placement_list[0].position = position;
Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
@@ -378,11 +378,11 @@ TEST_F(ExtendedDesktopTest, Capture) {
aura::test::EventCountDelegate r1_d2;
aura::test::EventCountDelegate r2_d1;
- scoped_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
&r1_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
&r1_d2, 0, gfx::Rect(10, 100, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
&r2_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[1]));
r1_w1->SetCapture();
@@ -448,11 +448,11 @@ TEST_F(ExtendedDesktopTest, CaptureEventLocation) {
aura::test::EventCountDelegate r1_d2;
aura::test::EventCountDelegate r2_d1;
- scoped_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
&r1_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
&r1_d2, 0, gfx::Rect(10, 100, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
&r2_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[1]));
r1_w1->SetCapture();
@@ -483,11 +483,11 @@ TEST_F(ExtendedDesktopTest, CaptureEventLocationHighDPI) {
aura::test::EventCountDelegate r1_d2;
aura::test::EventCountDelegate r2_d1;
- scoped_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
&r1_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
&r1_d2, 0, gfx::Rect(10, 100, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
&r2_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[1]));
r1_w1->SetCapture();
@@ -518,11 +518,11 @@ TEST_F(ExtendedDesktopTest, CaptureEventLocationHighDPI_2) {
aura::test::EventCountDelegate r1_d2;
aura::test::EventCountDelegate r2_d1;
- scoped_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
&r1_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
&r1_d2, 0, gfx::Rect(10, 100, 100, 100), root_windows[0]));
- scoped_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
&r2_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[1]));
r1_w1->SetCapture();
@@ -591,7 +591,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowByMouseClick) {
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
aura::test::EventCountDelegate delegate;
- scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
+ std::unique_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
&delegate, 0, gfx::Rect(10, 10, 100, 100), root_windows[0]));
MoveWindowByClickEventHandler event_handler(window.get());
window->AddPreTargetHandler(&event_handler);
« no previous file with comments | « ash/drag_drop/drag_image_view.h ('k') | ash/first_run/desktop_cleaner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698