chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/chromeos/login/signin/device_id_browsertest.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

index b61f430ce810ce3dcd5fa8a46f2d8519868f844d..c8e4ad1b896588925ffe9cbc00d09b90cfaa7146 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

@@ -119,7 +119,7 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {

private:

ScopedTestDeviceSettingsService test_device_settings_service_;

ScopedTestCrosSettings test_cros_settings_;

- scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;

+ std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;

};

TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) {