diff options
| author | rogerta <rogerta@chromium.org> | 2014-08-27 12:30:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 19:31:38 +0000 |
| commit | 69d3373d602b2ccbc19e6c5f4b87c802c02f0116 (patch) | |
| tree | 7666c08314813065514d59df8730bd474561d187 /google_apis | |
| parent | 2e2ec7c150110d82d2134050724d254237c9fe44 (diff) | |
| download | chromium_src-69d3373d602b2ccbc19e6c5f4b87c802c02f0116.zip chromium_src-69d3373d602b2ccbc19e6c5f4b87c802c02f0116.tar.gz chromium_src-69d3373d602b2ccbc19e6c5f4b87c802c02f0116.tar.bz2 | |
Use OAuth2AccessTokenFetcher implementation on Android. This cleans up the way that AO2TS overrides functionality from the base class to differentiate the way that access tokens are minted, and makes the overriding mechanism for android the same as for iOS. Its possible to reimplement OAuth2AccessTokenFetcher now that Mihai extended for use in bling.
BUG=390353
Review URL: https://codereview.chromium.org/345703003
Cr-Commit-Position: refs/heads/master@{#292205}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/oauth2_token_service.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc index 9a3877b..2cf8a2c 100644 --- a/google_apis/gaia/oauth2_token_service.cc +++ b/google_apis/gaia/oauth2_token_service.cc @@ -344,6 +344,8 @@ size_t OAuth2TokenService::Fetcher::GetWaitingRequestCount() const { } void OAuth2TokenService::Fetcher::Cancel() { + if (fetcher_) + fetcher_->CancelRequest(); fetcher_.reset(); retry_timer_.Stop(); error_ = GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED); |