chrome/browser/chromeos/login/existing_user_controller_auto_login_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/existing_user_controller_auto_login_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/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

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

index ce4be3305ccc87e49a0eae390e71a9c5e909e889..3a32b98a07492ca6e5c63e47b610595441c1307f 100644

--- a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

@@ -63,7 +63,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {

existing_user_controller_.reset(

new ExistingUserController(mock_login_display_host_.get()));

- scoped_ptr<base::DictionaryValue> account(new base::DictionaryValue);

+ std::unique_ptr<base::DictionaryValue> account(new base::DictionaryValue);

account->SetStringWithoutPathExpansion(

kAccountsPrefDeviceLocalAccountsKeyId, auto_login_user_id_);

account->SetIntegerWithoutPathExpansion(

@@ -140,7 +140,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {

// CreateLoginDisplay() on the |mock_login_display_host_| to get it.

MockLoginDisplay* mock_login_display_;

- scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;

+ std::unique_ptr<MockLoginDisplayHost> mock_login_display_host_;

base::MessageLoopForUI message_loop_;

content::TestBrowserThread ui_thread_;

ScopedTestingLocalState local_state_;

@@ -153,7 +153,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {

// |existing_user_controller_| must be destroyed before

// |device_settings_test_helper_|.

- scoped_ptr<ExistingUserController> existing_user_controller_;

+ std::unique_ptr<ExistingUserController> existing_user_controller_;

};

TEST_F(ExistingUserControllerAutoLoginTest, StartAutoLoginTimer) {