Revert of Fetch OAuth2 tokens prior to profile creation.

chrome/browser/chromeos/login/existing_user_controller.cc

Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 5d0c092c2dcde0dd105083b1f39e9e3ad1586e3e..ce08f36771da070ae3dbfda1040d72af7ae36b0d 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -29,7 +29,6 @@
 #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"
@@ -597,7 +596,7 @@
   //  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;
 
@@ -1123,15 +1122,6 @@
     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);
 }
 
@@ -1209,15 +1199,4 @@
   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