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

Unified Diff: chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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/supervised_user/child_accounts/permission_request_creator_apiary.cc
diff --git a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
index e08fd9623854ab8808fe460a07ac4a4b67c57032..a13119ccc0d44a338f989fcf172a4f308bba840c 100644
--- a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
+++ b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
@@ -158,9 +158,9 @@ void PermissionRequestCreatorApiary::CreateRequest(
const std::string& request_type,
const std::string& object_ref,
const SuccessCallback& callback) {
- requests_.push_back(
- new Request(request_type, object_ref, callback, url_fetcher_id_));
- StartFetching(requests_.back());
+ requests_.push_back(base::MakeUnique<Request>(request_type, object_ref,
+ callback, url_fetcher_id_));
+ StartFetching(requests_.back().get());
}
void PermissionRequestCreatorApiary::StartFetching(Request* request) {
@@ -174,7 +174,7 @@ void PermissionRequestCreatorApiary::OnGetTokenSuccess(
const OAuth2TokenService::Request* request,
const std::string& access_token,
const base::Time& expiration_time) {
- RequestIterator it = requests_.begin();
+ auto it = requests_.begin();
while (it != requests_.end()) {
if (request == (*it)->access_token_request.get())
break;
@@ -238,7 +238,7 @@ void PermissionRequestCreatorApiary::OnGetTokenSuccess(
void PermissionRequestCreatorApiary::OnGetTokenFailure(
const OAuth2TokenService::Request* request,
const GoogleServiceAuthError& error) {
- RequestIterator it = requests_.begin();
+ auto it = requests_.begin();
while (it != requests_.end()) {
if (request == (*it)->access_token_request.get())
break;
@@ -251,7 +251,7 @@ void PermissionRequestCreatorApiary::OnGetTokenFailure(
void PermissionRequestCreatorApiary::OnURLFetchComplete(
const URLFetcher* source) {
- RequestIterator it = requests_.begin();
+ auto it = requests_.begin();
while (it != requests_.end()) {
if (source == (*it)->url_fetcher.get())
break;
@@ -273,7 +273,7 @@ void PermissionRequestCreatorApiary::OnURLFetchComplete(
scopes.insert(GetApiScope());
oauth2_token_service_->InvalidateAccessToken(account_id_, scopes,
(*it)->access_token);
- StartFetching(*it);
+ StartFetching(it->get());
return;
}

Powered by Google App Engine
This is Rietveld 408576698