Revert "Speculative revert by sheriff"

chrome/browser/chromeos/login/session/user_session_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 979 matching lines @@
     // authentication to the user's profile. The proxy authentication state is
     // transferred unconditionally. If the user authenticated via an auth
     // extension, authentication cookies and channel IDs will be transferred as
     // well when the user's cookie jar is empty. If the cookie jar is not empty,
     // the authentication states in the browser context and the user's profile
     // must be merged using /MergeSession instead. Authentication cookies set by
     // a SAML IdP will also be transferred when the user's cookie jar is not
     // empty if |transfer_saml_auth_cookies_on_subsequent_login| is true.
     const bool transfer_auth_cookies_and_channel_ids_on_first_login =
         has_auth_cookies_;
-    ProfileAuthData::Transfer(
-        GetAuthRequestContext(),
-        profile->GetRequestContext(),
-        transfer_auth_cookies_and_channel_ids_on_first_login,
-        transfer_saml_auth_cookies_on_subsequent_login,
-        base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
-                   AsWeakPtr(),
-                   profile));
+
+    net::URLRequestContextGetter* auth_request_context =
+        GetAuthRequestContext();
+
+    // Authentication request context may be missing especially if user didn't
+    // sign in using GAIA (webview) and webview didn't yet initialize.
+    if (auth_request_context) {
+      ProfileAuthData::Transfer(
+          auth_request_context, profile->GetRequestContext(),
+          transfer_auth_cookies_and_channel_ids_on_first_login,
+          transfer_saml_auth_cookies_on_subsequent_login,
+          base::Bind(
+              &UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
+              AsWeakPtr(), profile));
+    } else {
+      // We need to post task so that OnProfileCreated() caller sends out
+      // NOTIFICATION_PROFILE_CREATED which marks user profile as initialized.
+      base::MessageLoopProxy::current()->PostTask(
+          FROM_HERE,
+          base::Bind(
+              &UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
+              AsWeakPtr(), profile));
+    }
     return;
   }
 
   FinalizePrepareProfile(profile);
 }
 
 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer(
     Profile* profile) {
   RestoreAuthSessionImpl(profile, has_auth_cookies_);
   FinalizePrepareProfile(profile);
@@ skipping 206 matching lines @@
 
   exit_after_session_restore_ = false;
 
   // Remove legacy OAuth1 token if we have one. If it's valid, we should already
   // have OAuth2 refresh token in OAuth2TokenService that could be used to
   // retrieve all other tokens and user_context.
   OAuth2LoginManager* login_manager =
       OAuth2LoginManagerFactory::GetInstance()->GetForProfile(profile);
   login_manager->AddObserver(this);
 
-  login_manager->RestoreSession(
-      GetAuthRequestContext(), session_restore_strategy_,
-      user_context_.GetRefreshToken(), user_context_.GetAuthCode());
+  net::URLRequestContextGetter* auth_request_context = GetAuthRequestContext();
+
+  // Authentication request context may not be available if user was not
+  // signing in with GAIA webview (i.e. webview instance hasn't been
+  // initialized at all). Use fallback request context.
+  if (!auth_request_context) {
+    auth_request_context =
+        authenticator_->authentication_context()->GetRequestContext();
+  }
+  login_manager->RestoreSession(auth_request_context, session_restore_strategy_,
+                                user_context_.GetRefreshToken(),
+                                user_context_.GetAuthCode());
 }
 
 void UserSessionManager::InitRlzImpl(Profile* profile, bool disabled) {
 #if defined(ENABLE_RLZ)
   PrefService* local_state = g_browser_process->local_state();
   if (disabled) {
     // Empty brand code means an organic install (no RLZ pings are sent).
     google_brand::chromeos::ClearBrandForCurrentSession();
   }
   if (disabled != local_state->GetBoolean(prefs::kRLZDisabled)) {
@@ skipping 168 matching lines @@
   EasyUnlockKeyManager* key_manager = GetEasyUnlockKeyManager();
   running_easy_unlock_key_ops_ = true;
   key_manager->RefreshKeys(
       user_context, *device_list,
       base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished, AsWeakPtr(),
                  user_context.GetUserID()));
 }
 
 net::URLRequestContextGetter*
 UserSessionManager::GetAuthRequestContext() const {
-  net::URLRequestContextGetter* auth_request_context = NULL;
+  net::URLRequestContextGetter* auth_request_context = nullptr;
 
   if (StartupUtils::IsWebviewSigninEnabled()) {
     // Webview uses different partition storage than iframe. We need to get
     // cookies from the right storage for url request to get auth token into
     // session.
-    auth_request_context = login::GetSigninPartition()->GetURLRequestContext();
+    content::StoragePartition* signin_partition = login::GetSigninPartition();
+    if (signin_partition)
+      auth_request_context = signin_partition->GetURLRequestContext();
   } else if (authenticator_.get() && authenticator_->authentication_context()) {
     auth_request_context =
         authenticator_->authentication_context()->GetRequestContext();
   }
   return auth_request_context;
 }
 
 void UserSessionManager::AttemptRestart(Profile* profile) {
   if (CheckEasyUnlockKeyOps(base::Bind(&UserSessionManager::AttemptRestart,
                                        AsWeakPtr(), profile))) {
@@ skipping 181 matching lines @@
     if (is_enterprise_managed)
       display = USER_PODS_DISPLAY_DISABLED_MANAGED;
     else
       display = USER_PODS_DISPLAY_DISABLED_REGULAR;
   }
   UMA_HISTOGRAM_ENUMERATION("UserSessionManager.UserPodsDisplay", display,
                             NUM_USER_PODS_DISPLAY);
 }
 
 }  // namespace chromeos