Commit 3cd77467 authored by Lowell Manners's avatar Lowell Manners Committed by Commit Bot

Delete OnRequestCompleted method from IdentityAccessorImpl.

This CL merges OnRequestCompleted's logic into
OnTokenRequestCompleted. There wasn't enough logic to warrant a
separate method.

Bug: 933109
Change-Id: I2074518187f6078ae2d5c22935aa8a4e911837fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1505498
Commit-Queue: Lowell Manners <lowell@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638576}
parent 7efd9afd
...@@ -35,18 +35,11 @@ void IdentityAccessorImpl::AccessTokenRequest::OnTokenRequestCompleted( ...@@ -35,18 +35,11 @@ void IdentityAccessorImpl::AccessTokenRequest::OnTokenRequestCompleted(
GoogleServiceAuthError error, GoogleServiceAuthError error,
AccessTokenInfo access_token_info) { AccessTokenInfo access_token_info) {
if (error.state() == GoogleServiceAuthError::NONE) { if (error.state() == GoogleServiceAuthError::NONE) {
OnRequestCompleted(access_token_info.token, std::move(consumer_callback_)
access_token_info.expiration_time, error); .Run(access_token_info.token, access_token_info.expiration_time, error);
} else { } else {
OnRequestCompleted(base::nullopt, base::Time(), error); std::move(consumer_callback_).Run(base::nullopt, base::Time(), error);
} }
}
void IdentityAccessorImpl::AccessTokenRequest::OnRequestCompleted(
const base::Optional<std::string>& access_token,
base::Time expiration_time,
const GoogleServiceAuthError& error) {
std::move(consumer_callback_).Run(access_token, expiration_time, error);
// Causes |this| to be deleted. // Causes |this| to be deleted.
manager_->AccessTokenRequestCompleted(this); manager_->AccessTokenRequestCompleted(this);
......
...@@ -46,14 +46,10 @@ class IdentityAccessorImpl : public mojom::IdentityAccessor, ...@@ -46,14 +46,10 @@ class IdentityAccessorImpl : public mojom::IdentityAccessor,
private: private:
// Invoked after access token request completes (successful or not). // Invoked after access token request completes (successful or not).
// Completes the pending access token request by calling back the consumer.
void OnTokenRequestCompleted(GoogleServiceAuthError error, void OnTokenRequestCompleted(GoogleServiceAuthError error,
AccessTokenInfo access_token_info); AccessTokenInfo access_token_info);
// Completes the pending access token request by calling back the consumer.
void OnRequestCompleted(const base::Optional<std::string>& access_token,
base::Time expiration_time,
const GoogleServiceAuthError& error);
std::unique_ptr<AccessTokenFetcher> access_token_fetcher_; std::unique_ptr<AccessTokenFetcher> access_token_fetcher_;
GetAccessTokenCallback consumer_callback_; GetAccessTokenCallback consumer_callback_;
IdentityAccessorImpl* manager_; IdentityAccessorImpl* manager_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment