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

chrome/browser/signin/account_reconcilor.cc

Index: chrome/browser/signin/account_reconcilor.cc
diff --git a/chrome/browser/signin/account_reconcilor.cc b/chrome/browser/signin/account_reconcilor.cc
index ed10cbec78b33d35a6db68e26dddf711f6da0b3c..043d77390135163596238dd54f0045fcf1b5d611 100644
--- a/chrome/browser/signin/account_reconcilor.cc
+++ b/chrome/browser/signin/account_reconcilor.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/google_auto_login_helper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ -78,10 +77,12 @@ void AccountReconcilor::UserIdFetcher::OnNetworkError(int response_code) {
 
 AccountReconcilor::AccountReconcilor(Profile* profile)
     : profile_(profile),
+      merge_session_helper_(profile),
       registered_with_token_service_(false),
       are_gaia_accounts_set_(false),
       requests_(NULL) {
   DVLOG(1) << "AccountReconcilor::AccountReconcilor";
+  merge_session_helper_.disable_auto_delete_when_done();
   RegisterWithSigninManager();
   RegisterWithCookieMonster();
 
@@ -236,9 +237,7 @@ void AccountReconcilor::OnRefreshTokenRevoked(const std::string& account_id) {
 void AccountReconcilor::OnRefreshTokensLoaded() {}
 
 void AccountReconcilor::PerformMergeAction(const std::string& account_id) {
-  // GoogleAutoLoginHelper deletes itself upon success / failure.
-  GoogleAutoLoginHelper* helper = new GoogleAutoLoginHelper(profile_);
-  helper->LogIn(account_id);
+  merge_session_helper_.LogIn(account_id);
 }
 
 void AccountReconcilor::PerformRemoveAction(const std::string& account_id) {