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

chrome/browser/signin/signin_manager.cc

Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 72e446c389ff40321df0abcc95603c3fe3ac48aa..3cf6fcf2c81b88934433a862d52ad806852bafd0 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/signin/about_signin_internals.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
+#include "chrome/browser/signin/google_auto_login_helper.h"
 #include "chrome/browser/signin/local_auth.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ -563,6 +564,14 @@ void SigninManager::CompletePendingSignin() {
   token_service->UpdateCredentials(GetAuthenticatedUsername(),
                                    temp_oauth_login_tokens_.refresh_token);
   temp_oauth_login_tokens_ = ClientOAuthResult();
+
+  // If inline sign in is enabled, but new profile manage is not, perform a
+  // merge session now to push the user's credentials into the cookie jar.
+  if (!switches::IsNewProfileManagement() && switches::IsEnableInlineSignin()) {
+    // The helper deletes itself when done.
+    GoogleAutoLoginHelper* helper = new GoogleAutoLoginHelper(profile_);
+    helper->LogIn();
+  }
 }
 
 void SigninManager::OnExternalSigninCompleted(const std::string& username) {