diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:09:42 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:09:42 +0000 |
| commit | 3b634aed8c7296e80ecbf042266258fadaae3e14 (patch) | |
| tree | 74a55365aee22e7a91f1d70fc0d19a393d885b72 /google_apis | |
| parent | c9fdb486cbd97ef85168d4b864ac673f44a32b4e (diff) | |
| download | chromium_src-3b634aed8c7296e80ecbf042266258fadaae3e14.zip chromium_src-3b634aed8c7296e80ecbf042266258fadaae3e14.tar.gz chromium_src-3b634aed8c7296e80ecbf042266258fadaae3e14.tar.bz2 | |
Update google_apis/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16288003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/gaia_oauth_client.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index a9bae4f..b218840b 100644 --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc @@ -125,9 +125,8 @@ void GaiaOAuthClient::Core::GetUserInfo(const std::string& oauth_access_token, request_.reset(net::URLFetcher::Create( 0, GURL(GaiaUrls::GetInstance()->oauth_user_info_url()), net::URLFetcher::GET, this)); - request_->SetRequestContext(request_context_getter_); - request_->AddExtraRequestHeader( - "Authorization: OAuth " + oauth_access_token); + request_->SetRequestContext(request_context_getter_.get()); + request_->AddExtraRequestHeader("Authorization: OAuth " + oauth_access_token); request_->SetMaxRetriesOn5xx(max_retries); // Fetchers are sometimes cancelled because a network change was detected, // especially at startup and after sign-in on ChromeOS. Retrying once should @@ -146,7 +145,7 @@ void GaiaOAuthClient::Core::MakeGaiaRequest( num_retries_ = 0; request_.reset(net::URLFetcher::Create( 0, gaia_url_, net::URLFetcher::POST, this)); - request_->SetRequestContext(request_context_getter_); + request_->SetRequestContext(request_context_getter_.get()); request_->SetUploadData("application/x-www-form-urlencoded", post_body); request_->SetMaxRetriesOn5xx(max_retries); // See comment on SetAutomaticallyRetryOnNetworkChanges() above. @@ -168,7 +167,7 @@ void GaiaOAuthClient::Core::OnURLFetchComplete( num_retries_++; // We must set our request_context_getter_ again because // URLFetcher::Core::RetryOrCompleteUrlFetch resets it to NULL... - request_->SetRequestContext(request_context_getter_); + request_->SetRequestContext(request_context_getter_.get()); request_->Start(); } } |