Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: chrome/browser/chromeos/login/signin/token_handle_util.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
Index: chrome/browser/chromeos/login/signin/token_handle_util.cc
diff --git a/chrome/browser/chromeos/login/signin/token_handle_util.cc b/chrome/browser/chromeos/login/signin/token_handle_util.cc
index 1ca6f0455ae195ad7c216bb701478ccc6b6da855..c85b92b6427e505465c054c4469fa08c9939baaa 100644
--- a/chrome/browser/chromeos/login/signin/token_handle_util.cc
+++ b/chrome/browser/chromeos/login/signin/token_handle_util.cc
@@ -60,7 +60,7 @@ void TokenHandleUtil::DeleteHandle(const AccountId& account_id) {
const base::DictionaryValue* dict = nullptr;
if (!user_manager::known_user::FindPrefs(account_id, &dict))
return;
- scoped_ptr<base::DictionaryValue> dict_copy(dict->DeepCopy());
+ std::unique_ptr<base::DictionaryValue> dict_copy(dict->DeepCopy());
dict_copy->Remove(kTokenHandlePref, nullptr);
dict_copy->Remove(kTokenHandleStatusPref, nullptr);
user_manager::known_user::UpdatePrefs(account_id, *dict_copy.get(),
@@ -92,7 +92,7 @@ void TokenHandleUtil::CheckToken(const AccountId& account_id,
}
validation_delegates_.set(
- token, scoped_ptr<TokenDelegate>(new TokenDelegate(
+ token, std::unique_ptr<TokenDelegate>(new TokenDelegate(
weak_factory_.GetWeakPtr(), account_id, token, callback)));
gaia_client_->GetTokenHandleInfo(token, kMaxRetries,
validation_delegates_.get(token));
@@ -144,7 +144,7 @@ void TokenHandleUtil::TokenDelegate::OnNetworkError(int response_code) {
}
void TokenHandleUtil::TokenDelegate::OnGetTokenInfoResponse(
- scoped_ptr<base::DictionaryValue> token_info) {
+ std::unique_ptr<base::DictionaryValue> token_info) {
TokenHandleStatus outcome = UNKNOWN;
if (!token_info->HasKey("error")) {
int expires_in = 0;
« no previous file with comments | « chrome/browser/chromeos/login/signin/token_handle_util.h ('k') | chrome/browser/chromeos/login/signin_screen_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698