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

chrome/browser/signin/account_reconcilor.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/signin/account_reconcilor.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #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"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 48 matching lines @@
            << " response_code=" << response_code;
 
   // TODO(rogerta): some response error should not be treated like
   // permanent errors.  Figure out appropriate ones.
   reconcilor_->HandleFailedAccountIdCheck(account_id_);
 }
 
 AccountReconcilor::AccountReconcilor(Profile* profile)
     : OAuth2TokenService::Consumer("account_reconcilor"),
       profile_(profile),
+      merge_session_helper_(profile, NULL),
       registered_with_token_service_(false),
-      are_gaia_accounts_set_(false),
-      requests_(NULL) {
+      are_gaia_accounts_set_(false),requests_(NULL) {
   DVLOG(1) << "AccountReconcilor::AccountReconcilor";
   RegisterWithSigninManager();
   RegisterWithCookieMonster();
 
   // If this profile is not connected, the reconcilor should do nothing but
   // wait for the connection.
   if (IsProfileConnected()) {
     RegisterWithTokenService();
     StartPeriodicReconciliation();
   }
 }
 
 AccountReconcilor::~AccountReconcilor() {
   // Make sure shutdown was called first.
   DCHECK(!registered_with_token_service_);
   DCHECK(registrar_.IsEmpty());
   DCHECK(!reconciliation_timer_.IsRunning());
   DCHECK(!requests_);
   DCHECK_EQ(0u, user_id_fetchers_.size());
 }
 
 void AccountReconcilor::Shutdown() {
   DVLOG(1) << "AccountReconcilor::Shutdown";
+  merge_session_helper_.CancelAll();
   DeleteAccessTokenRequestsAndUserIdFetchers();
   UnregisterWithSigninManager();
   UnregisterWithTokenService();
   UnregisterWithCookieMonster();
   StopPeriodicReconciliation();
 }
 
+void AccountReconcilor::AddMergeSessionObserver(
+    GoogleAutoLoginHelper::Observer* observer) {
+  merge_session_helper_.AddObserver(observer);
+}
+
+void AccountReconcilor::RemoveMergeSessionObserver(
+    GoogleAutoLoginHelper::Observer* observer) {
+  merge_session_helper_.RemoveObserver(observer);
+}
+
 void AccountReconcilor::DeleteAccessTokenRequestsAndUserIdFetchers() {
   delete[] requests_;
   requests_ = NULL;
 
   user_id_fetchers_.clear();
 }
 
 bool AccountReconcilor::AreAllRefreshTokensChecked() const {
   return chrome_accounts_.size() ==
       (valid_chrome_accounts_.size() + invalid_chrome_accounts_.size());
@@ skipping 105 matching lines @@
 }
 
 void AccountReconcilor::OnRefreshTokenRevoked(const std::string& account_id) {
   DVLOG(1) << "AccountReconcilor::OnRefreshTokenRevoked: " << account_id;
   PerformRemoveAction(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) {
   // TODO(acleung): Implement this:
 }
 
 void AccountReconcilor::StartReconcileAction() {
   if (!IsProfileConnected())
     return;
 
@@ skipping 139 matching lines @@
     const std::string& account_id) {
   valid_chrome_accounts_.insert(account_id);
   FinishReconcileAction();
 }
 
 void AccountReconcilor::HandleFailedAccountIdCheck(
     const std::string& account_id) {
   invalid_chrome_accounts_.insert(account_id);
   FinishReconcileAction();
 }