cros: Remove get user info code from OAuth2LoginManager

chrome/browser/chromeos/login/signin/oauth2_login_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_verifier.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class GoogleServiceAuthError;
 class Profile;
 class ProfileOAuth2TokenService;
 
 namespace chromeos {
 
 // This class is responsible for restoring authenticated web sessions out of
 // OAuth2 refresh tokens or pre-authenticated cookie jar.
 class OAuth2LoginManager : public KeyedService,
-                           public gaia::GaiaOAuthClient::Delegate,
                            public OAuth2LoginVerifier::Delegate,
                            public OAuth2TokenFetcher::Delegate,
                            public OAuth2TokenService::Observer {
  public:
   // Session restore states.
   enum SessionRestoreState {
     // Session restore is not started.
     SESSION_RESTORE_NOT_STARTED = 0,
     // Session restore is being prepared.
     SESSION_RESTORE_PREPARING = 1,
@@ skipping 98 matching lines @@
     POST_MERGE_MISSING_PRIMARY_ACCOUNT = 3,
     POST_MERGE_PRIMARY_NOT_FIRST_ACCOUNT = 4,
     POST_MERGE_VERIFICATION_FAILED = 5,
     POST_MERGE_CONNECTION_FAILED = 6,
     POST_MERGE_COUNT = 7,
   };
 
   // KeyedService implementation.
   void Shutdown() override;
 
-  // gaia::GaiaOAuthClient::Delegate overrides.
-  void OnRefreshTokenResponse(const std::string& access_token,
-                              int expires_in_seconds) override;
-  void OnGetUserInfoResponse(
-      std::unique_ptr<base::DictionaryValue> user_info) override;
-  void OnOAuthError() override;
-  void OnNetworkError(int response_code) override;
-
   // OAuth2LoginVerifier::Delegate overrides.
   void OnSessionMergeSuccess() override;
   void OnSessionMergeFailure(bool connection_error) override;
   void OnListAccountsSuccess(
       const std::vector<gaia::ListedAccount>& accounts) override;
   void OnListAccountsFailure(bool connection_error) override;
 
   // OAuth2TokenFetcher::Delegate overrides.
   void OnOAuth2TokensAvailable(
       const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) override;
   void OnOAuth2TokensFetchFailed() override;
 
   // OAuth2TokenService::Observer implementation:
   void OnRefreshTokenAvailable(const std::string& user_email) override;
 
   // Signals delegate that authentication is completed, kicks off token fetching
   // process.
   void CompleteAuthentication();
 
   // Retrieves ProfileOAuth2TokenService for |user_profile_|.
   ProfileOAuth2TokenService* GetTokenService();
 
   // Retrieves the primary account for |user_profile_|.
-  const std::string& GetPrimaryAccountId();
+  std::string GetPrimaryAccountId();
 
   // Records |refresh_token_| to token service. The associated account id is
   // assumed to be the primary account id of the user profile. If the primary
   // account id is not present, GetAccountInfoOfRefreshToken will be called to
   // retrieve the associated account info.
   void StoreOAuth2Token();
 
-  // Get the account info corresponding to the specified refresh token.
-  void GetAccountInfoOfRefreshToken(const std::string& refresh_token);
-
   // Update the token service and inform listeners of a new refresh token.
   void UpdateCredentials(const std::string& account_id);
 
   // Notify that the refresh tokens are loaded and ready to use.
   void FireRefreshTokensLoaded();
 
   // Attempts to fetch OAuth2 tokens by using pre-authenticated cookie jar from
   // provided |auth_profile|.
   void FetchOAuth2Tokens();
 
@@ skipping 32 matching lines @@
   Profile* user_profile_;
   scoped_refptr<net::URLRequestContextGetter> auth_request_context_;
   SessionRestoreStrategy restore_strategy_;
   SessionRestoreState state_;
 
   // Whether there is pending TokenService::LoadCredentials call.
   bool pending_token_service_load_ = false;
 
   std::unique_ptr<OAuth2TokenFetcher> oauth2_token_fetcher_;
   std::unique_ptr<OAuth2LoginVerifier> login_verifier_;
-  std::unique_ptr<gaia::GaiaOAuthClient> account_info_fetcher_;
 
   // OAuth2 refresh token.
   std::string refresh_token_;
 
   // OAuthLogin scoped access token.
   std::string oauthlogin_access_token_;
 
   // Session restore start time.
   base::Time session_restore_start_;
 
   // List of observers to notify when token availability changes.
   // Makes sure list is empty on destruction.
   // TODO(zelidrag|gspencer): Figure out how to get rid of ProfileHelper so we
   // can change the line below to base::ObserverList<Observer, true>.
   base::ObserverList<Observer, false> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_