Revert of Fetch OAuth2 tokens prior to profile creation.

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 40 matching lines @@
 
   // Session restore strategy.
   enum SessionRestoreStrategy {
     // Generate OAuth2 refresh token from authentication profile's cookie jar.
     // Restore session from generated OAuth2 refresh token.
     RESTORE_FROM_COOKIE_JAR,
     // Restore session from saved OAuth2 refresh token from TokenServices.
     RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN,
     // Restore session from OAuth2 refresh token passed via command line.
     RESTORE_FROM_PASSED_OAUTH2_REFRESH_TOKEN,
+    // Restore session from authentication code passed via command line.
+    RESTORE_FROM_AUTH_CODE,
   };
 
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Raised when merge session state changes.
     virtual void OnSessionRestoreStateChanged(Profile* user_profile,
                                               SessionRestoreState state) {}
 
     // Raised when a new OAuth2 refresh token is avaialble.
     virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) {}
 
     // Raised when session's GAIA credentials (SID+LSID) are available to
     // other signed in services.
     virtual void OnSessionAuthenticated(Profile* user_profile) {}
   };
 
   explicit OAuth2LoginManager(Profile* user_profile);
   ~OAuth2LoginManager() override;
 
   void AddObserver(OAuth2LoginManager::Observer* observer);
   void RemoveObserver(OAuth2LoginManager::Observer* observer);
 
-  // Restores and verifies OAuth tokens following specified |restore_strategy|.
-  // For |restore_strategy| RESTORE_FROM_PASSED_OAUTH2_REFRESH_TOKEN, parameter
-  // |oauth2_refresh_token| needs to have a non-empty value.
-  // For |restore_strategy| RESTORE_FROM_COOKIE_JAR |auth_request_context| must
-  // be initialized.
-  void RestoreSession(net::URLRequestContextGetter* auth_request_context,
-                      SessionRestoreStrategy restore_strategy,
-                      const std::string& oauth2_refresh_token,
-                      const std::string& oauth2_access_token);
+  // Restores and verifies OAuth tokens either following specified
+  // |restore_strategy|. For |restore_strategy| with values
+  // RESTORE_FROM_PASSED_OAUTH2_REFRESH_TOKEN or
+  // RESTORE_FROM_AUTH_CODE, respectively
+  // parameters |oauth2_refresh_token| or |auth_code| need to have non-empty
+  // value.
+  // For |restore_strategy| with values RESTORE_FROM_COOKIE_JAR or
+  // RESTORE_FROM_AUTH_CODE |auth_request_context| must be initialized.
+  void RestoreSession(
+      net::URLRequestContextGetter* auth_request_context,
+      SessionRestoreStrategy restore_strategy,
+      const std::string& oauth2_refresh_token,
+      const std::string& auth_code);
 
   // Continues session restore after transient network errors.
   void ContinueSessionRestore();
 
-  // Start restoring session from saved OAuth2 refresh token.
+  // Start resporting session from saved OAuth2 refresh token.
   void RestoreSessionFromSavedTokens();
 
   // Stops all background authentication requests.
   void Stop();
 
   // Returns session restore state.
   SessionRestoreState state() { return state_; }
 
   const base::Time& session_restore_start() { return session_restore_start_; }
 
@@ skipping 30 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;
+                                      int expires_in_seconds) override;
   void OnGetUserInfoResponse(
       scoped_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::string& data) override;
   void OnListAccountsFailure(bool connection_error) override;
@@ skipping 77 matching lines @@
   scoped_ptr<OAuth2LoginVerifier> login_verifier_;
   scoped_ptr<gaia::GaiaOAuthClient> account_info_fetcher_;
   scoped_ptr<TokenHandleUtil> token_handle_util_;
 
   // 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_;
 
   base::WeakPtrFactory<OAuth2LoginManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_