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

Side by Side Diff: chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc

Issue 1117703002: Adjust URLFetcher::Create API so that object is returned as scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded Pass() calls Created 5 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/supervised_user/child_accounts/family_info_fetcher.h" 5 #include "chrome/browser/supervised_user/child_accounts/family_info_fetcher.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "net/base/load_flags.h" 10 #include "net/base/load_flags.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 160
161 void FamilyInfoFetcher::OnGetTokenSuccess( 161 void FamilyInfoFetcher::OnGetTokenSuccess(
162 const OAuth2TokenService::Request* request, 162 const OAuth2TokenService::Request* request,
163 const std::string& access_token, 163 const std::string& access_token,
164 const base::Time& expiration_time) { 164 const base::Time& expiration_time) {
165 DCHECK_EQ(access_token_request_.get(), request); 165 DCHECK_EQ(access_token_request_.get(), request);
166 access_token_ = access_token; 166 access_token_ = access_token;
167 167
168 GURL url(kFamilyApiUrl + request_suffix_); 168 GURL url(kFamilyApiUrl + request_suffix_);
169 const int id = 0; 169 const int id = 0;
170 url_fetcher_.reset( 170 url_fetcher_ = net::URLFetcher::Create(id, url, request_type_, this);
171 net::URLFetcher::Create(id, url, request_type_, this));
172 171
173 url_fetcher_->SetRequestContext(request_context_); 172 url_fetcher_->SetRequestContext(request_context_);
174 url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | 173 url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
175 net::LOAD_DO_NOT_SAVE_COOKIES); 174 net::LOAD_DO_NOT_SAVE_COOKIES);
176 url_fetcher_->SetAutomaticallyRetryOnNetworkChanges(kNumRetries); 175 url_fetcher_->SetAutomaticallyRetryOnNetworkChanges(kNumRetries);
177 url_fetcher_->AddExtraRequestHeader( 176 url_fetcher_->AddExtraRequestHeader(
178 base::StringPrintf(kAuthorizationHeaderFormat, access_token.c_str())); 177 base::StringPrintf(kAuthorizationHeaderFormat, access_token.c_str()));
179 178
180 url_fetcher_->Start(); 179 url_fetcher_->Start();
181 } 180 }
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 consumer_->OnFailure(SERVICE_ERROR); 310 consumer_->OnFailure(SERVICE_ERROR);
312 return; 311 return;
313 } 312 }
314 std::vector<FamilyMember> members; 313 std::vector<FamilyMember> members;
315 if (!ParseMembers(members_list, &members)){ 314 if (!ParseMembers(members_list, &members)){
316 consumer_->OnFailure(SERVICE_ERROR); 315 consumer_->OnFailure(SERVICE_ERROR);
317 return; 316 return;
318 } 317 }
319 consumer_->OnGetFamilyMembersSuccess(members); 318 consumer_->OnGetFamilyMembersSuccess(members);
320 } 319 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698