| Index: chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
|
| diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
|
| index d0888348336dd494591b5d125b308f9c54d1c4ff..f2eb1f0e6e51c71cc146585fd4b01b9467502660 100644
|
| --- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
|
| +++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/base64.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| @@ -173,10 +175,8 @@ SupervisedUserRegistrationUtility::Create(Profile* profile) {
|
| SupervisedUserSharedSettingsService* supervised_user_shared_settings_service =
|
| SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
|
| return make_scoped_ptr(SupervisedUserRegistrationUtility::CreateImpl(
|
| - profile->GetPrefs(),
|
| - token_fetcher.Pass(),
|
| - supervised_user_sync_service,
|
| - supervised_user_shared_settings_service));
|
| + profile->GetPrefs(), std::move(token_fetcher),
|
| + supervised_user_sync_service, supervised_user_shared_settings_service));
|
| }
|
|
|
| // static
|
| @@ -201,10 +201,8 @@ SupervisedUserRegistrationUtility::CreateImpl(
|
| scoped_ptr<SupervisedUserRefreshTokenFetcher> token_fetcher,
|
| SupervisedUserSyncService* service,
|
| SupervisedUserSharedSettingsService* shared_settings_service) {
|
| - return new SupervisedUserRegistrationUtilityImpl(prefs,
|
| - token_fetcher.Pass(),
|
| - service,
|
| - shared_settings_service);
|
| + return new SupervisedUserRegistrationUtilityImpl(
|
| + prefs, std::move(token_fetcher), service, shared_settings_service);
|
| }
|
|
|
| namespace {
|
| @@ -215,7 +213,7 @@ SupervisedUserRegistrationUtilityImpl::SupervisedUserRegistrationUtilityImpl(
|
| SupervisedUserSyncService* service,
|
| SupervisedUserSharedSettingsService* shared_settings_service)
|
| : prefs_(prefs),
|
| - token_fetcher_(token_fetcher.Pass()),
|
| + token_fetcher_(std::move(token_fetcher)),
|
| supervised_user_sync_service_(service),
|
| supervised_user_shared_settings_service_(shared_settings_service),
|
| pending_supervised_user_acknowledged_(false),
|
|
|