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

chrome/browser/android/signin/signin_manager_android.cc

Index: chrome/browser/android/signin/signin_manager_android.cc
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
index ec69c01ff0b0c576292160406a79af017730a6d3..af22d1575cd52c268a9eb585d88fcc72d7ec6241 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/android_profile_oauth2_token_service.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"
@@ -206,6 +205,12 @@ void SigninManagerAndroid::OnBrowsingDataRemoverDone() {
                                         java_signin_manager_.obj());
 }
 
+void SigninManagerAndroid::MergeSessionCompleted(
+    const std::string& account_id,
+    const GoogleServiceAuthError& error) {
+  merge_session_helper_.reset();
+}
+
 void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) {
   if (switches::IsNewProfileManagement()) {
     // New Mirror code path that just fires the events and let the
@@ -223,9 +228,8 @@ void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) {
     // Old code path that doesn't depend on the new Account Reconcilor.
     // We manually login.
 
-    // AutoLogin deletes itself.
-    GoogleAutoLoginHelper* autoLogin = new GoogleAutoLoginHelper(profile_);
-    autoLogin->LogIn();
+    merge_session_helper_.reset(new GoogleAutoLoginHelper(profile_, this));
+    merge_session_helper_->LogIn();
   }
 }