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

Unified Diff: chrome/browser/signin/oauth2_token_service.cc

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/signin/oauth2_token_service.cc
diff --git a/chrome/browser/signin/oauth2_token_service.cc b/chrome/browser/signin/oauth2_token_service.cc
index aeacd41eacd340ffe9270719ad3004a8a89e21a8..6b3d1b849ab20968a2272f052ad863be7aedb8e2 100644
--- a/chrome/browser/signin/oauth2_token_service.cc
+++ b/chrome/browser/signin/oauth2_token_service.cc
@@ -171,7 +171,7 @@ OAuth2TokenService::Fetcher::Fetcher(
retry_number_(0),
error_(GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
DCHECK(oauth2_token_service_);
- DCHECK(getter_);
+ DCHECK(getter_.get());
DCHECK(refresh_token_.length());
waiting_requests_.push_back(waiting_request);
}
@@ -183,7 +183,7 @@ OAuth2TokenService::Fetcher::~Fetcher() {
}
void OAuth2TokenService::Fetcher::Start() {
- fetcher_.reset(new OAuth2AccessTokenFetcher(this, getter_));
+ fetcher_.reset(new OAuth2AccessTokenFetcher(this, getter_.get()));
fetcher_->Start(GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
refresh_token_,
@@ -347,9 +347,12 @@ scoped_ptr<OAuth2TokenService::Request> OAuth2TokenService::StartRequest(
iter->second->AddWaitingRequest(request->AsWeakPtr());
return request.PassAs<Request>();
}
- pending_fetchers_[fetch_parameters] = Fetcher::CreateAndStart(
- this, request_context_getter_, refresh_token, scopes,
- request->AsWeakPtr());
+ pending_fetchers_[fetch_parameters] =
+ Fetcher::CreateAndStart(this,
+ request_context_getter_.get(),
+ refresh_token,
+ scopes,
+ request->AsWeakPtr());
return request.PassAs<Request>();
}
« no previous file with comments | « chrome/browser/sessions/tab_restore_service_helper.cc ('k') | chrome/browser/signin/oauth2_token_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698