cros: Remove get user info code from OAuth2LoginManager

chrome/browser/chromeos/login/signin/oauth2_login_manager.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 "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 
 namespace chromeos {
 
-namespace {
-
-static const char kServiceScopeGetUserInfo[] =
-    "https://www.googleapis.com/auth/userinfo.email";
-static const int kMaxRetries = 5;
-
-}  // namespace
-
 OAuth2LoginManager::OAuth2LoginManager(Profile* user_profile)
     : user_profile_(user_profile),
       restore_strategy_(RESTORE_FROM_COOKIE_JAR),
       state_(SESSION_RESTORE_NOT_STARTED) {
   GetTokenService()->AddObserver(this);
 
   // For telemetry, we mark session restore completed to avoid warnings from
   // MergeSessionThrottle.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableGaiaServices)) {
@@ skipping 47 matching lines @@
 }
 
 void OAuth2LoginManager::RestoreSessionFromSavedTokens() {
   // Just return if there is a pending TokenService::LoadCredentials call.
   // Session restore continues in OnRefreshTokenAvailable when the call
   // finishes.
   if (pending_token_service_load_)
     return;
 
   ProfileOAuth2TokenService* token_service = GetTokenService();
-  const std::string& primary_account_id = GetPrimaryAccountId();
+  const std::string primary_account_id = GetPrimaryAccountId();
   if (token_service->RefreshTokenIsAvailable(primary_account_id)) {
     VLOG(1) << "OAuth2 refresh token is already loaded.";
     FireRefreshTokensLoaded();
     VerifySessionCookies();
   } else {
     VLOG(1) << "Loading OAuth2 refresh token from database.";
 
     // Flag user with unknown token status in case there are no saved tokens
     // and OnRefreshTokenAvailable is not called. Flagging it here would
     // cause user to go through Gaia in next login to obtain a new refresh
@@ skipping 46 matching lines @@
 
     pending_token_service_load_ = false;
     VerifySessionCookies();
   }
 }
 
 ProfileOAuth2TokenService* OAuth2LoginManager::GetTokenService() {
   return ProfileOAuth2TokenServiceFactory::GetForProfile(user_profile_);
 }
 
-const std::string& OAuth2LoginManager::GetPrimaryAccountId() {
+std::string OAuth2LoginManager::GetPrimaryAccountId() {
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(user_profile_);
-  return signin_manager->GetAuthenticatedAccountId();
+  const std::string primary_account_id =
+      signin_manager->GetAuthenticatedAccountId();
+  LOG_IF(ERROR, primary_account_id.empty()) << "Primary account id is empty.";
+  return primary_account_id;
 }
 
 void OAuth2LoginManager::StoreOAuth2Token() {
-  const std::string& primary_account_id = GetPrimaryAccountId();
-  if (primary_account_id.empty()) {
-    GetAccountInfoOfRefreshToken(refresh_token_);
-    return;
-  }
-
-  UpdateCredentials(primary_account_id);
-}
-
-void OAuth2LoginManager::GetAccountInfoOfRefreshToken(
-    const std::string& refresh_token) {
-  gaia::OAuthClientInfo client_info;
-  GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
-  client_info.client_id = gaia_urls->oauth2_chrome_client_id();
-  client_info.client_secret = gaia_urls->oauth2_chrome_client_secret();
-
-  account_info_fetcher_.reset(new gaia::GaiaOAuthClient(
-      auth_request_context_.get()));
-  account_info_fetcher_->RefreshToken(client_info, refresh_token,
-      std::vector<std::string>(1, kServiceScopeGetUserInfo), kMaxRetries,
-      this);
+  UpdateCredentials(GetPrimaryAccountId());
 }
 
 void OAuth2LoginManager::UpdateCredentials(const std::string& account_id) {
   DCHECK(!account_id.empty());
   DCHECK(!refresh_token_.empty());
   // |account_id| is assumed to be already canonicalized if it's an email.
   GetTokenService()->UpdateCredentials(account_id, refresh_token_);
   FireRefreshTokensLoaded();
 
   for (auto& observer : observer_list_)
     observer.OnNewRefreshTokenAvaiable(user_profile_);
 }
 
 void OAuth2LoginManager::FireRefreshTokensLoaded() {
   // TODO(570218): Figure out the right way to plumb this.
   GetTokenService()->LoadCredentials(std::string());
 }
 
-void OAuth2LoginManager::OnRefreshTokenResponse(
-    const std::string& access_token,
-    int expires_in_seconds) {
-  account_info_fetcher_->GetUserInfo(access_token, kMaxRetries, this);
-}
-
-void OAuth2LoginManager::OnGetUserInfoResponse(
-    std::unique_ptr<base::DictionaryValue> user_info) {
-  account_info_fetcher_.reset();
-
-  std::string gaia_id;
-  std::string email;
-  user_info->GetString("id", &gaia_id);
-  user_info->GetString("email", &email);
-
-  AccountTrackerService* account_tracker =
-      AccountTrackerServiceFactory::GetForProfile(user_profile_);
-  account_tracker->SeedAccountInfo(gaia_id, email);
-  UpdateCredentials(account_tracker->PickAccountIdForAccount(gaia_id, email));
-}
-
-void OAuth2LoginManager::OnOAuthError() {
-  account_info_fetcher_.reset();
-  LOG(ERROR) << "Account info fetch failed!";
-  SetSessionRestoreState(OAuth2LoginManager::SESSION_RESTORE_FAILED);
-}
-
-void OAuth2LoginManager::OnNetworkError(int response_code) {
-  account_info_fetcher_.reset();
-  LOG(ERROR) << "Account info fetch failed! response_code=" << response_code;
-  SetSessionRestoreState(OAuth2LoginManager::SESSION_RESTORE_FAILED);
-}
-
 void OAuth2LoginManager::FetchOAuth2Tokens() {
   DCHECK(auth_request_context_.get());
   if (restore_strategy_ != RESTORE_FROM_COOKIE_JAR) {
     NOTREACHED();
     SetSessionRestoreState(SESSION_RESTORE_FAILED);
     return;
   }
 
   // If we have authenticated cookie jar, get OAuth1 token first, then fetch
   // SID/LSID cookies through OAuthLogin call.
@@ skipping 166 matching lines @@
   for (auto& observer : observer_list_)
     observer.OnSessionRestoreStateChanged(user_profile_, state_);
 }
 
 void OAuth2LoginManager::SetSessionRestoreStartForTesting(
     const base::Time& time) {
   session_restore_start_ = time;
 }
 
 }  // namespace chromeos