chrome/browser/chromeos/login/supervised/supervised_user_test_base.h - 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/supervised/supervised_user_test_base.h

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

Index: chrome/browser/chromeos/login/supervised/supervised_user_test_base.h

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h

index 15c3c4c14687431dbeeeb0c4530f2148f701f03d..8652d80381e48a5922cdb622a8123dab5158eeb3 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h

@@ -36,7 +36,7 @@ class SupervisedUsersSyncTestAdapter {

bool HasChanges() { return !processor_->changes().empty(); }

- scoped_ptr< ::sync_pb::ManagedUserSpecifics> GetFirstChange();

+ std::unique_ptr<::sync_pb::ManagedUserSpecifics> GetFirstChange();

void AddChange(const ::sync_pb::ManagedUserSpecifics& proto, bool update);

@@ -51,7 +51,8 @@ class SupervisedUsersSharedSettingsSyncTestAdapter {

bool HasChanges() { return !processor_->changes().empty(); }

- scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> GetFirstChange();

+ std::unique_ptr<::sync_pb::ManagedUserSharedSettingSpecifics>

+ GetFirstChange();

void AddChange(const ::sync_pb::ManagedUserSharedSettingSpecifics& proto,

bool update);

@@ -104,10 +105,11 @@ class SupervisedUserTestBase : public chromeos::LoginManagerTest {

cryptohome::MockHomedirMethods* mock_homedir_methods_;

NetworkPortalDetectorTestImpl* network_portal_detector_;

SupervisedUserRegistrationUtilityStub* registration_utility_stub_;

- scoped_ptr<ScopedTestingSupervisedUserRegistrationUtility> scoped_utility_;

- scoped_ptr<SupervisedUsersSharedSettingsSyncTestAdapter>

+ std::unique_ptr<ScopedTestingSupervisedUserRegistrationUtility>

+ scoped_utility_;

+ std::unique_ptr<SupervisedUsersSharedSettingsSyncTestAdapter>

shared_settings_adapter_;

- scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;

+ std::unique_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;

private:

DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase);