Delay loading the NTP after sign in until MergeSession has been performed in

chrome/browser/signin/signin_manager.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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 99 matching lines @@
 }
 
 bool SigninManager::IsSigninProcess(int process_id) const {
   return process_id == signin_host_id_;
 }
 
 bool SigninManager::HasSigninProcess() const {
   return signin_host_id_ != ChildProcessHost::kInvalidUniqueID;
 }
 
+void SigninManager::AddMergeSessionObserver(
+    GoogleAutoLoginHelper::Observer* observer) {
+  if (merge_session_helper_)
+    merge_session_helper_->AddObserver(observer);
+}
+
+void SigninManager::RemoveMergeSessionObserver(
+    GoogleAutoLoginHelper::Observer* observer) {
+  if (merge_session_helper_)
+    merge_session_helper_->RemoveObserver(observer);
+}
+
 SigninManager::~SigninManager() {
 }
 
 void SigninManager::InitTokenService() {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   if (token_service && !GetAuthenticatedUsername().empty())
     token_service->LoadCredentials();
 }
 
@@ skipping 232 matching lines @@
   if ((!user.empty() && !IsAllowedUsername(user)) || !IsSigninAllowed()) {
     // User is signed in, but the username is invalid - the administrator must
     // have changed the policy since the last signin, so sign out the user.
     SignOut();
   }
 
   account_id_helper_.reset(new SigninAccountIdHelper(profile));
 }
 
 void SigninManager::Shutdown() {
+  if (merge_session_helper_)
+    merge_session_helper_->CancelAll();
+
   local_state_pref_registrar_.RemoveAll();
   account_id_helper_.reset();
   SigninManagerBase::Shutdown();
 }
 
 void SigninManager::OnGoogleServicesUsernamePatternChanged() {
   if (!GetAuthenticatedUsername().empty() &&
       !IsAllowedUsername(GetAuthenticatedUsername())) {
     // Signed in user is invalid according to the current policy so sign
     // the user out.
@@ skipping 168 matching lines @@
   } else {
     // No oauth token or callback, so just complete our pending signin.
     CompletePendingSignin();
   }
 }
 
 void SigninManager::CompletePendingSignin() {
   DCHECK(!possibly_invalid_username_.empty());
   OnSignedIn(possibly_invalid_username_);
 
+  // If inline sign in is enabled, but new profile management is not, perform a
+  // merge session now to push the user's credentials into the cookie jar.
+  bool do_merge_session_in_signin_manager =
+      !switches::IsEnableWebBasedSignin() &&
+      !switches::IsNewProfileManagement();
+
+  if (do_merge_session_in_signin_manager)
+    merge_session_helper_.reset(new GoogleAutoLoginHelper(profile_, NULL));
+
   DCHECK(!temp_oauth_login_tokens_.refresh_token.empty());
   DCHECK(!GetAuthenticatedUsername().empty());
   ProfileOAuth2TokenService* token_service =
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   token_service->UpdateCredentials(GetAuthenticatedUsername(),
                                    temp_oauth_login_tokens_.refresh_token);
   temp_oauth_login_tokens_ = ClientOAuthResult();
+
+  if (do_merge_session_in_signin_manager)
+    merge_session_helper_->LogIn();
 }
 
 void SigninManager::OnExternalSigninCompleted(const std::string& username) {
   OnSignedIn(username);
 }
 
 void SigninManager::OnSignedIn(const std::string& username) {
   SetAuthenticatedUsername(username);
   possibly_invalid_username_.clear();
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
@@ skipping 41 matching lines @@
   }
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const {
   return prohibit_signout_;
 }