Revert of Inline sign in extracts gaia id from HTTP header and seeds account tracker

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 <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 131 matching lines @@
     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(
-      scoped_ptr<base::DictionaryValue> user_info) override;
+                              int expires_in_seconds) override;
+  void OnGetUserEmailResponse(const std::string& user_email) 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::string& data) 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& account_id) 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();
 
   // 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.
+  // account id is not present, GetAccountIdOfRefreshToken will be called to
+  // retrieve the associated account id.
   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);
+  // Get the account id corresponding to the specified refresh token.
+  void GetAccountIdOfRefreshToken(const std::string& refresh_token);
 
   // Attempts to fetch OAuth2 tokens by using pre-authenticated cookie jar from
   // provided |auth_profile|.
   void FetchOAuth2Tokens();
 
   // Reports when all tokens are loaded.
   void ReportOAuth2TokensLoaded();
 
   // Checks if primary account sessions cookies are stale and restores them
   // if needed.
@@ skipping 24 matching lines @@
 
   // Keeps the track if we have already reported OAuth2 token being loaded
   // by OAuth2TokenService.
   Profile* user_profile_;
   scoped_refptr<net::URLRequestContextGetter> auth_request_context_;
   SessionRestoreStrategy restore_strategy_;
   SessionRestoreState state_;
 
   scoped_ptr<OAuth2TokenFetcher> oauth2_token_fetcher_;
   scoped_ptr<OAuth2LoginVerifier> login_verifier_;
-  scoped_ptr<gaia::GaiaOAuthClient> account_info_fetcher_;
+  scoped_ptr<gaia::GaiaOAuthClient> account_id_fetcher_;
 
   // OAuth2 refresh token.
   std::string refresh_token_;
 
   // OAuthLogin scoped access token.
   std::string oauthlogin_access_token_;
 
   // Authorization code for fetching OAuth2 tokens.
   std::string auth_code_;
 
   // 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 ObserverList<Observer, true>.
   ObserverList<Observer, false> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_