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

Side by Side Diff: google_apis/gaia/oauth2_token_service_request.cc

Issue 1873663002: Convert //google_apis from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 "google_apis/gaia/oauth2_token_service_request.h" 5 #include "google_apis/gaia/oauth2_token_service_request.h"
6 6
7 #include <memory>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/location.h" 10 #include "base/location.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
13 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
14 #include "google_apis/gaia/google_service_auth_error.h" 15 #include "google_apis/gaia/google_service_auth_error.h"
15 #include "google_apis/gaia/oauth2_access_token_consumer.h" 16 #include "google_apis/gaia/oauth2_access_token_consumer.h"
16 17
17 OAuth2TokenServiceRequest::TokenServiceProvider::TokenServiceProvider() { 18 OAuth2TokenServiceRequest::TokenServiceProvider::TokenServiceProvider() {
18 } 19 }
19 20
20 OAuth2TokenServiceRequest::TokenServiceProvider::~TokenServiceProvider() { 21 OAuth2TokenServiceRequest::TokenServiceProvider::~TokenServiceProvider() {
21 } 22 }
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 base::Time expiration_time); 186 base::Time expiration_time);
186 void InformOwnerOnGetTokenFailure(GoogleServiceAuthError error); 187 void InformOwnerOnGetTokenFailure(GoogleServiceAuthError error);
187 188
188 scoped_refptr<base::SingleThreadTaskRunner> owner_task_runner_; 189 scoped_refptr<base::SingleThreadTaskRunner> owner_task_runner_;
189 OAuth2TokenService::Consumer* const consumer_; 190 OAuth2TokenService::Consumer* const consumer_;
190 std::string account_id_; 191 std::string account_id_;
191 OAuth2TokenService::ScopeSet scopes_; 192 OAuth2TokenService::ScopeSet scopes_;
192 193
193 // OAuth2TokenService request for fetching OAuth2 access token; it should be 194 // OAuth2TokenService request for fetching OAuth2 access token; it should be
194 // created, reset and accessed only on the token service thread. 195 // created, reset and accessed only on the token service thread.
195 scoped_ptr<OAuth2TokenService::Request> request_; 196 std::unique_ptr<OAuth2TokenService::Request> request_;
196 197
197 DISALLOW_COPY_AND_ASSIGN(RequestCore); 198 DISALLOW_COPY_AND_ASSIGN(RequestCore);
198 }; 199 };
199 200
200 RequestCore::RequestCore( 201 RequestCore::RequestCore(
201 OAuth2TokenServiceRequest* owner, 202 OAuth2TokenServiceRequest* owner,
202 const scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>& 203 const scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>&
203 provider, 204 provider,
204 OAuth2TokenService::Consumer* consumer, 205 OAuth2TokenService::Consumer* consumer,
205 const std::string& account_id, 206 const std::string& account_id,
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 320 }
320 321
321 void InvalidateCore::StopOnTokenServiceThread() { 322 void InvalidateCore::StopOnTokenServiceThread() {
322 DCHECK(token_service_task_runner()->BelongsToCurrentThread()); 323 DCHECK(token_service_task_runner()->BelongsToCurrentThread());
323 // Nothing to do. 324 // Nothing to do.
324 } 325 }
325 326
326 } // namespace 327 } // namespace
327 328
328 // static 329 // static
329 scoped_ptr<OAuth2TokenServiceRequest> OAuth2TokenServiceRequest::CreateAndStart( 330 std::unique_ptr<OAuth2TokenServiceRequest>
331 OAuth2TokenServiceRequest::CreateAndStart(
330 const scoped_refptr<TokenServiceProvider>& provider, 332 const scoped_refptr<TokenServiceProvider>& provider,
331 const std::string& account_id, 333 const std::string& account_id,
332 const OAuth2TokenService::ScopeSet& scopes, 334 const OAuth2TokenService::ScopeSet& scopes,
333 OAuth2TokenService::Consumer* consumer) { 335 OAuth2TokenService::Consumer* consumer) {
334 scoped_ptr<OAuth2TokenServiceRequest> request( 336 std::unique_ptr<OAuth2TokenServiceRequest> request(
335 new OAuth2TokenServiceRequest(account_id)); 337 new OAuth2TokenServiceRequest(account_id));
336 scoped_refptr<Core> core( 338 scoped_refptr<Core> core(
337 new RequestCore(request.get(), provider, consumer, account_id, scopes)); 339 new RequestCore(request.get(), provider, consumer, account_id, scopes));
338 request->StartWithCore(core); 340 request->StartWithCore(core);
339 return request; 341 return request;
340 } 342 }
341 343
342 // static 344 // static
343 void OAuth2TokenServiceRequest::InvalidateToken( 345 void OAuth2TokenServiceRequest::InvalidateToken(
344 const scoped_refptr<TokenServiceProvider>& provider, 346 const scoped_refptr<TokenServiceProvider>& provider,
345 const std::string& account_id, 347 const std::string& account_id,
346 const OAuth2TokenService::ScopeSet& scopes, 348 const OAuth2TokenService::ScopeSet& scopes,
347 const std::string& access_token) { 349 const std::string& access_token) {
348 scoped_ptr<OAuth2TokenServiceRequest> request( 350 std::unique_ptr<OAuth2TokenServiceRequest> request(
349 new OAuth2TokenServiceRequest(account_id)); 351 new OAuth2TokenServiceRequest(account_id));
350 scoped_refptr<Core> core(new InvalidateCore( 352 scoped_refptr<Core> core(new InvalidateCore(
351 request.get(), provider, access_token, account_id, scopes)); 353 request.get(), provider, access_token, account_id, scopes));
352 request->StartWithCore(core); 354 request->StartWithCore(core);
353 } 355 }
354 356
355 OAuth2TokenServiceRequest::~OAuth2TokenServiceRequest() { 357 OAuth2TokenServiceRequest::~OAuth2TokenServiceRequest() {
356 core_->Stop(); 358 core_->Stop();
357 } 359 }
358 360
359 std::string OAuth2TokenServiceRequest::GetAccountId() const { 361 std::string OAuth2TokenServiceRequest::GetAccountId() const {
360 return account_id_; 362 return account_id_;
361 } 363 }
362 364
363 OAuth2TokenServiceRequest::OAuth2TokenServiceRequest( 365 OAuth2TokenServiceRequest::OAuth2TokenServiceRequest(
364 const std::string& account_id) 366 const std::string& account_id)
365 : account_id_(account_id) { 367 : account_id_(account_id) {
366 DCHECK(!account_id_.empty()); 368 DCHECK(!account_id_.empty());
367 } 369 }
368 370
369 void OAuth2TokenServiceRequest::StartWithCore(const scoped_refptr<Core>& core) { 371 void OAuth2TokenServiceRequest::StartWithCore(const scoped_refptr<Core>& core) {
370 DCHECK(core.get()); 372 DCHECK(core.get());
371 core_ = core; 373 core_ = core;
372 core_->Start(); 374 core_->Start();
373 } 375 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698