Moving oauth code from host to base to allow code sharing between host and client.

remoting/base/oauth_token_getter_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/oauth_token_getter_impl.h"
+#include "remoting/base/oauth_token_getter_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "google_apis/google_api_keys.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/logging.h"
 
@@ skipping 29 matching lines @@
                                                const std::string& access_token,
                                                int expires_seconds) {
   NOTREACHED();
 }
 
 void OAuthTokenGetterImpl::OnRefreshTokenResponse(
     const std::string& access_token,
     int expires_seconds) {
   DCHECK(CalledOnValidThread());
   DCHECK(oauth_credentials_.get());
-  HOST_LOG << "Received OAuth token.";
+  VLOG(1) << "Received OAuth token.";
 
   oauth_access_token_ = access_token;
   base::TimeDelta token_expiration =
       base::TimeDelta::FromSeconds(expires_seconds) -
       base::TimeDelta::FromSeconds(kTokenUpdateTimeBeforeExpirySeconds);
   auth_token_expiry_time_ = base::Time::Now() + token_expiration;
 
   if (refresh_timer_) {
     refresh_timer_->Stop();
     refresh_timer_->Start(FROM_HERE, token_expiration, this,
                           &OAuthTokenGetterImpl::RefreshOAuthToken);
   }
 
   if (!oauth_credentials_->is_service_account && !email_verified_) {
     gaia_oauth_client_->GetUserEmail(access_token, kMaxRetries, this);
   } else {
     refreshing_oauth_token_ = false;
     NotifyCallbacks(OAuthTokenGetterImpl::SUCCESS, oauth_credentials_->login,
                     oauth_access_token_);
   }
 }
 
 void OAuthTokenGetterImpl::OnGetUserEmailResponse(
     const std::string& user_email) {
   DCHECK(CalledOnValidThread());
   DCHECK(oauth_credentials_.get());
-  HOST_LOG << "Received user info.";
+  VLOG(1) << "Received user info.";
 
   if (user_email != oauth_credentials_->login) {
     LOG(ERROR) << "OAuth token and email address do not refer to "
                   "the same account.";
     OnOAuthError();
     return;
   }
 
   email_verified_ = true;
   refreshing_oauth_token_ = false;
@@ skipping 34 matching lines @@
   DCHECK(CalledOnValidThread());
   LOG(ERROR) << "Network error when trying to update OAuth token: "
              << response_code;
   refreshing_oauth_token_ = false;
   NotifyCallbacks(OAuthTokenGetterImpl::NETWORK_ERROR, std::string(),
                   std::string());
 }
 
 void OAuthTokenGetterImpl::CallWithToken(const TokenCallback& on_access_token) {
   DCHECK(CalledOnValidThread());
-  bool need_new_auth_token = auth_token_expiry_time_.is_null() ||
-                             base::Time::Now() >= auth_token_expiry_time_ ||
-                             (!oauth_credentials_->is_service_account &&
-                              !email_verified_);
+  bool need_new_auth_token =
+      auth_token_expiry_time_.is_null() ||
+      base::Time::Now() >= auth_token_expiry_time_ ||
+      (!oauth_credentials_->is_service_account && !email_verified_);
 
   if (need_new_auth_token) {
     pending_callbacks_.push(on_access_token);
     if (!refreshing_oauth_token_)
       RefreshOAuthToken();
   } else {
     on_access_token.Run(SUCCESS, oauth_credentials_->login,
                         oauth_access_token_);
   }
 }
 
 void OAuthTokenGetterImpl::InvalidateCache() {
   DCHECK(CalledOnValidThread());
   auth_token_expiry_time_ = base::Time();
 }
 
 void OAuthTokenGetterImpl::RefreshOAuthToken() {
   DCHECK(CalledOnValidThread());
-  HOST_LOG << "Refreshing OAuth token.";
+  VLOG(1) << "Refreshing OAuth token.";
   DCHECK(!refreshing_oauth_token_);
 
   // Service accounts use different API keys, as they use the client app flow.
   google_apis::OAuth2Client oauth2_client =
       oauth_credentials_->is_service_account ? google_apis::CLIENT_REMOTING_HOST
                                              : google_apis::CLIENT_REMOTING;
 
   gaia::OAuthClientInfo client_info = {
       google_apis::GetOAuth2ClientID(oauth2_client),
       google_apis::GetOAuth2ClientSecret(oauth2_client),
       // Redirect URL is only used when getting tokens from auth code. It
       // is not required when getting access tokens.
       ""};
 
   refreshing_oauth_token_ = true;
   std::vector<std::string> empty_scope_list;  // Use scope from refresh token.
   gaia_oauth_client_->RefreshToken(client_info,
                                    oauth_credentials_->refresh_token,
                                    empty_scope_list, kMaxRetries, this);
 }
 
 }  // namespace remoting