Revert of Fetch OAuth2 tokens prior to profile creation.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 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/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
 #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h"
 #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
-#include "chrome/browser/chromeos/login/signin/oauth2_token_initializer.h"
 #include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
@@ skipping 547 matching lines @@
 
   StopPublicSessionAutoLoginTimer();
 
   // Truth table of |has_auth_cookies|:
   //                          Regular        SAML
   //  /ServiceLogin              T            T
   //  /ChromeOsEmbeddedSetup     F            T
   //  Bootstrap experiment       F            N/A
   const bool has_auth_cookies =
       login_performer_->auth_mode() == LoginPerformer::AUTH_MODE_EXTENSION &&
-      (user_context.GetAccessToken().empty() ||
+      (user_context.GetAuthCode().empty() ||
        user_context.GetAuthFlow() == UserContext::AUTH_FLOW_GAIA_WITH_SAML) &&
       user_context.GetAuthFlow() != UserContext::AUTH_FLOW_EASY_BOOTSTRAP;
 
   // LoginPerformer instance will delete itself in case of successful auth.
   login_performer_->set_delegate(NULL);
   ignore_result(login_performer_.release());
 
   UserSessionManager::StartSessionType start_session_type =
       UserAddingScreen::Get()->IsRunning()
           ? UserSessionManager::SECONDARY_USER_SESSION
@@ skipping 505 matching lines @@
   if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) {
     bootstrap_user_context_initializer_.reset(
         new BootstrapUserContextInitializer());
     bootstrap_user_context_initializer_->Start(
         user_context.GetAuthCode(),
         base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized,
                    weak_factory_.GetWeakPtr()));
     return;
   }
 
-  // Fetch OAuth2 tokens if we have an auth code.
-  if (!user_context.GetAuthCode().empty()) {
-    oauth2_token_initializer_.reset(new OAuth2TokenInitializer);
-    oauth2_token_initializer_->Start(
-        user_context, base::Bind(&ExistingUserController::OnOAuth2TokensFetched,
-                                 weak_factory_.GetWeakPtr()));
-    return;
-  }
-
   PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION);
 }
 
 void ExistingUserController::DoLogin(const UserContext& user_context,
                                      const SigninSpecifics& specifics) {
   if (is_login_in_progress_) {
     // If there is another login in progress, bail out. Do not re-enable
     // clicking on other windows and the status area. Do not start the
     // auto-login timer.
     return;
@@ skipping 57 matching lines @@
   // for bootstrap after the user session is started.
   ChromeUserManager::Get()->SetUserFlow(
       user_context.GetUserID(),
       new BootstrapUserFlow(
           user_context,
           bootstrap_user_context_initializer_->random_key_used()));
 
   PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION);
 }
 
-void ExistingUserController::OnOAuth2TokensFetched(
-    bool success,
-    const UserContext& user_context) {
-  if (!success) {
-    LOG(ERROR) << "OAuth2 token fetch failed.";
-    OnAuthFailure(AuthFailure(AuthFailure::NETWORK_AUTH_FAILED));
-    return;
-  }
-  PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION);
-}
-
 }  // namespace chromeos