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

chrome/browser/android/signin/signin_manager_android.cc

 // Copyright 2013 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/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #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"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
 #include "jni/SigninManager_jni.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/browser_policy_connector.h"
@@ skipping 169 matching lines @@
   model->RemoveAll();
 
   // All the Profile data has been wiped. Clear the last signed in username as
   // well, so that the next signin doesn't trigger the acount change dialog.
   profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesLastUsername);
 
   Java_SigninManager_onProfileDataWiped(base::android::AttachCurrentThread(),
                                         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
     // Account Reconcilor handles everything.
     AndroidProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile(
             profile_);
     const std::string& primary_acct = token_service->GetPrimaryAccountId();
     const std::vector<std::string>& ids = token_service->GetAccounts();
     token_service->ValidateAccounts(primary_acct, ids);
 
   } else {
     DVLOG(1) << "SigninManagerAndroid::LogInSignedInUser "
         " Manually calling GoogleAutoLoginHelper";
     // 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();
   }
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   SigninManagerAndroid* signin_manager_android =
       new SigninManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(signin_manager_android);
 }
 
 static jboolean ShouldLoadPolicyForUser(JNIEnv* env,
                                         jobject obj,
                                         jstring j_username) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   std::string username =
       base::android::ConvertJavaStringToUTF8(env, j_username);
   return !policy::BrowserPolicyConnector::IsNonEnterpriseUser(username);
 #else
   return false;
 #endif
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }