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

chrome/browser/signin/account_reconcilor.h

Index: chrome/browser/signin/account_reconcilor.h
diff --git a/chrome/browser/signin/account_reconcilor.h b/chrome/browser/signin/account_reconcilor.h
index db8f0b7a0a1f6f959d9dbdb4be9850f0b806a814..174f5e621092fc5b35de0809b3e53a765482504d 100644
--- a/chrome/browser/signin/account_reconcilor.h
+++ b/chrome/browser/signin/account_reconcilor.h
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "chrome/browser/signin/google_auto_login_helper.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -19,10 +20,10 @@ class Profile;
 struct ChromeCookieDetails;
 
 class AccountReconcilor : public BrowserContextKeyedService,
-                                 content::NotificationObserver,
-                                 GaiaAuthConsumer,
-                                 OAuth2TokenService::Consumer,
-                                 OAuth2TokenService::Observer {
+                          public content::NotificationObserver,
+                          public GaiaAuthConsumer,
+                          public OAuth2TokenService::Consumer,
+                          public OAuth2TokenService::Observer {
  public:
   explicit AccountReconcilor(Profile* profile);
   virtual ~AccountReconcilor();
@@ -30,6 +31,10 @@ class AccountReconcilor : public BrowserContextKeyedService,
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
+  // Add or remove observers for the merge session notification.
+  void AddMergeSessionObserver(GoogleAutoLoginHelper::Observer* observer);
+  void RemoveMergeSessionObserver(GoogleAutoLoginHelper::Observer* observer);
+
   Profile* profile() { return profile_; }
 
   bool IsPeriodicReconciliationRunning() const {
@@ -126,6 +131,7 @@ class AccountReconcilor : public BrowserContextKeyedService,
   Profile* profile_;
   content::NotificationRegistrar registrar_;
   base::RepeatingTimer<AccountReconcilor> reconciliation_timer_;
+  GoogleAutoLoginHelper merge_session_helper_;
   bool registered_with_token_service_;
 
   // Used during reconcile action.