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

Unified Diff: chrome/browser/chromeos/login/oauth2_login_verifier.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/oauth2_login_verifier.cc
diff --git a/chrome/browser/chromeos/login/oauth2_login_verifier.cc b/chrome/browser/chromeos/login/oauth2_login_verifier.cc
index 25f19ae20b9cd5fd3a54fcf41665284348fe5ca9..ad31626feb9545a0c86d79bae8fb2c4feba30f2d 100644
--- a/chrome/browser/chromeos/login/oauth2_login_verifier.cc
+++ b/chrome/browser/chromeos/login/oauth2_login_verifier.cc
@@ -74,12 +74,13 @@ void OAuth2LoginVerifier::StartFetchingOAuthLoginAccessToken() {
gaia_token_.clear();
std::vector<std::string> scopes;
scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
- token_fetcher_.reset(new OAuth2AccessTokenFetcher(
- this, system_request_context_)),
- token_fetcher_->Start(GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
- GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
- refresh_token_,
- scopes);
+ token_fetcher_
+ .reset(new OAuth2AccessTokenFetcher(this, system_request_context_.get())),
+ token_fetcher_
+ ->Start(GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
+ GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
+ refresh_token_,
+ scopes);
}
void OAuth2LoginVerifier::OnGetTokenSuccess(
@@ -105,9 +106,10 @@ void OAuth2LoginVerifier::OnGetTokenFailure(
void OAuth2LoginVerifier::StartOAuthLoginForUberToken() {
// No service will fetch us uber auth token.
- gaia_system_fetcher_.reset(new GaiaAuthFetcher(
- this, std::string(GaiaConstants::kChromeOSSource),
- system_request_context_));
+ gaia_system_fetcher_.reset(
+ new GaiaAuthFetcher(this,
+ std::string(GaiaConstants::kChromeOSSource),
+ system_request_context_.get()));
gaia_system_fetcher_->StartTokenFetchForUberAuthExchange(access_token_);
}
@@ -134,9 +136,10 @@ void OAuth2LoginVerifier::OnUberAuthTokenFailure(
void OAuth2LoginVerifier::StartOAuthLoginForGaiaCredentials() {
// No service will fetch us uber auth token.
- gaia_system_fetcher_.reset(new GaiaAuthFetcher(
- this, std::string(GaiaConstants::kChromeOSSource),
- system_request_context_));
+ gaia_system_fetcher_.reset(
+ new GaiaAuthFetcher(this,
+ std::string(GaiaConstants::kChromeOSSource),
+ system_request_context_.get()));
gaia_system_fetcher_->StartOAuthLogin(access_token_, EmptyString());
}
@@ -163,9 +166,10 @@ void OAuth2LoginVerifier::OnClientLoginFailure(
void OAuth2LoginVerifier::StartMergeSession() {
DCHECK(!gaia_token_.empty());
- gaia_fetcher_.reset(new GaiaAuthFetcher(
- this, std::string(GaiaConstants::kChromeOSSource),
- user_request_context_));
+ gaia_fetcher_.reset(
+ new GaiaAuthFetcher(this,
+ std::string(GaiaConstants::kChromeOSSource),
+ user_request_context_.get()));
gaia_fetcher_->StartMergeSession(gaia_token_);
}

Powered by Google App Engine
This is Rietveld 408576698