ash/wm/gestures/overview_gesture_handler_unittest.cc - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/gestures/overview_gesture_handler_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

« ash/wm/gestures/long_press_affordance_handler.cc ('K') | « ash/wm/gestures/long_press_affordance_handler.cc ('k') | ash/wm/gestures/shelf_gesture_handler.h » ('j') | ash/wm/gestures/shelf_gesture_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/gestures/overview_gesture_handler_unittest.cc

diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc

index 620d4734ea5235d31e3a7ffaf292c00a52b813bf..4f4b1f8701a3a25601b76e1ab054090a26c4a8c3 100644

--- a/ash/wm/gestures/overview_gesture_handler_unittest.cc

+++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc

@@ -40,8 +40,8 @@ class OverviewGestureHandlerTest : public test::AshTestBase {

TEST_F(OverviewGestureHandlerTest, VerticalSwipes) {

gfx::Rect bounds(0, 0, 400, 400);

aura::Window* root_window = Shell::GetPrimaryRootWindow();

- scoped_ptr<aura::Window> window1(CreateWindow(bounds));

- scoped_ptr<aura::Window> window2(CreateWindow(bounds));

+ std::unique_ptr<aura::Window> window1(CreateWindow(bounds));

+ std::unique_ptr<aura::Window> window2(CreateWindow(bounds));

ui::test::EventGenerator generator(root_window, root_window);

generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),

0, -500, 100, 3);

@@ -67,8 +67,8 @@ TEST_F(OverviewGestureHandlerTest, VerticalSwipes) {

TEST_F(OverviewGestureHandlerTest, HorizontalSwipes) {

gfx::Rect bounds(0, 0, 400, 400);

aura::Window* root_window = Shell::GetPrimaryRootWindow();

- scoped_ptr<aura::Window> window1(CreateWindow(bounds));

- scoped_ptr<aura::Window> window2(CreateWindow(bounds));

+ std::unique_ptr<aura::Window> window1(CreateWindow(bounds));

+ std::unique_ptr<aura::Window> window2(CreateWindow(bounds));

ui::test::EventGenerator generator(root_window, root_window);

generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),

600, -500, 100, 3);

@@ -84,8 +84,8 @@ TEST_F(OverviewGestureHandlerTest, HorizontalSwipes) {

TEST_F(OverviewGestureHandlerTest, SwipeUpDownWithoutReleasing) {

gfx::Rect bounds(0, 0, 400, 400);

aura::Window* root_window = Shell::GetPrimaryRootWindow();

- scoped_ptr<aura::Window> window1(CreateWindow(bounds));

- scoped_ptr<aura::Window> window2(CreateWindow(bounds));

+ std::unique_ptr<aura::Window> window1(CreateWindow(bounds));

+ std::unique_ptr<aura::Window> window2(CreateWindow(bounds));

ui::test::EventGenerator generator(root_window, root_window);

base::TimeDelta timestamp = base::TimeDelta::FromInternalValue(

base::TimeTicks::Now().ToInternalValue());