| Index: remoting/base/oauth_token_getter_impl.cc
|
| diff --git a/remoting/base/oauth_token_getter_impl.cc b/remoting/base/oauth_token_getter_impl.cc
|
| index 4f49a4559f2e0c0809b3005cf89a52ed59eebbdc..bb57c7db1b59a67a36c7b602b77463b2746fe975 100644
|
| --- a/remoting/base/oauth_token_getter_impl.cc
|
| +++ b/remoting/base/oauth_token_getter_impl.cc
|
| @@ -56,12 +56,14 @@ OAuthTokenGetterImpl::OAuthTokenGetterImpl(
|
| }
|
| }
|
|
|
| -OAuthTokenGetterImpl::~OAuthTokenGetterImpl() {}
|
| +OAuthTokenGetterImpl::~OAuthTokenGetterImpl() {
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| +}
|
|
|
| void OAuthTokenGetterImpl::OnGetTokensResponse(const std::string& refresh_token,
|
| const std::string& access_token,
|
| int expires_seconds) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(intermediate_credentials_);
|
| VLOG(1) << "Received OAuth tokens.";
|
|
|
| @@ -85,7 +87,7 @@ void OAuthTokenGetterImpl::OnGetTokensResponse(const std::string& refresh_token,
|
| void OAuthTokenGetterImpl::OnRefreshTokenResponse(
|
| const std::string& access_token,
|
| int expires_seconds) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(authorization_credentials_);
|
| VLOG(1) << "Received OAuth token.";
|
|
|
| @@ -104,7 +106,7 @@ void OAuthTokenGetterImpl::OnRefreshTokenResponse(
|
|
|
| void OAuthTokenGetterImpl::OnGetUserEmailResponse(
|
| const std::string& user_email) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(authorization_credentials_);
|
| VLOG(1) << "Received user info.";
|
|
|
| @@ -148,7 +150,7 @@ void OAuthTokenGetterImpl::NotifyTokenCallbacks(
|
| Status status,
|
| const std::string& user_email,
|
| const std::string& access_token) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| std::queue<TokenCallback> callbacks(pending_callbacks_);
|
| pending_callbacks_ = std::queue<TokenCallback>();
|
|
|
| @@ -161,14 +163,14 @@ void OAuthTokenGetterImpl::NotifyTokenCallbacks(
|
| void OAuthTokenGetterImpl::NotifyUpdatedCallbacks(
|
| const std::string& user_email,
|
| const std::string& refresh_token) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (credentials_updated_callback_) {
|
| credentials_updated_callback_.Run(user_email, refresh_token);
|
| }
|
| }
|
|
|
| void OAuthTokenGetterImpl::OnOAuthError() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| LOG(ERROR) << "OAuth: invalid credentials.";
|
| response_pending_ = false;
|
|
|
| @@ -182,7 +184,7 @@ void OAuthTokenGetterImpl::OnOAuthError() {
|
| }
|
|
|
| void OAuthTokenGetterImpl::OnNetworkError(int response_code) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| LOG(ERROR) << "Network error when trying to update OAuth token: "
|
| << response_code;
|
| response_pending_ = false;
|
| @@ -191,7 +193,7 @@ void OAuthTokenGetterImpl::OnNetworkError(int response_code) {
|
| }
|
|
|
| void OAuthTokenGetterImpl::CallWithToken(const TokenCallback& on_access_token) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (intermediate_credentials_) {
|
| pending_callbacks_.push(on_access_token);
|
| if (!response_pending_) {
|
| @@ -216,12 +218,12 @@ void OAuthTokenGetterImpl::CallWithToken(const TokenCallback& on_access_token) {
|
| }
|
|
|
| void OAuthTokenGetterImpl::InvalidateCache() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| access_token_expiry_time_ = base::Time();
|
| }
|
|
|
| void OAuthTokenGetterImpl::GetOauthTokensFromAuthCode() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| VLOG(1) << "Fetching OAuth token from Auth Code.";
|
| DCHECK(!response_pending_);
|
|
|
| @@ -254,7 +256,7 @@ void OAuthTokenGetterImpl::GetOauthTokensFromAuthCode() {
|
| }
|
|
|
| void OAuthTokenGetterImpl::RefreshAccessToken() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| VLOG(1) << "Refreshing OAuth Access token.";
|
| DCHECK(!response_pending_);
|
|
|
|
|