Index: chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc |
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc |
index 3e2ffc09dced8f7e7453a30a313fc0fd7ee20c22..9986ed35ebc33ec68eb4c53c96afb4c7df3d997b 100644 |
--- a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc |
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc |
@@ -137,7 +137,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded( |
return; |
} |
base::Base64Decode(base64_signature, &signature); |
- scoped_ptr<base::DictionaryValue> data_copy(password_data->DeepCopy()); |
+ std::unique_ptr<base::DictionaryValue> data_copy(password_data->DeepCopy()); |
cryptohome::KeyDefinition key(password, |
kCryptohomeSupervisedUserKeyLabel, |
kCryptohomeSupervisedUserKeyPrivileges); |
@@ -184,7 +184,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded( |
} |
void SupervisedUserLoginFlow::OnNewKeyAdded( |
- scoped_ptr<base::DictionaryValue> password_data) { |
+ std::unique_ptr<base::DictionaryValue> password_data) { |
VLOG(1) << "New key added"; |
SupervisedUserAuthentication* auth = |
ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication(); |
@@ -228,7 +228,7 @@ void SupervisedUserLoginFlow::OnAuthenticationFailure( |
} |
void SupervisedUserLoginFlow::OnPasswordUpdated( |
- scoped_ptr<base::DictionaryValue> password_data) { |
+ std::unique_ptr<base::DictionaryValue> password_data) { |
VLOG(1) << "Updated password for supervised user"; |
SupervisedUserAuthentication* auth = |