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

chrome/browser/android/signin/signin_manager_android.h

Index: chrome/browser/android/signin/signin_manager_android.h
diff --git a/chrome/browser/android/signin/signin_manager_android.h b/chrome/browser/android/signin/signin_manager_android.h
index 40bb4113d9ef3cd7683d86af4f1cd7a6cd3baa3e..49e1a03acc2cbffa9c265346da99c96230133d77 100644
--- a/chrome/browser/android/signin/signin_manager_android.h
+++ b/chrome/browser/android/signin/signin_manager_android.h
@@ -13,7 +13,9 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/signin/google_auto_login_helper.h"
 
+class GoogleServiceAuthError;
 class Profile;
 
 namespace policy {
@@ -28,7 +30,7 @@ class CloudPolicyClient;
 //
 // This class implements parts of the sign-in flow, to make sure that policy
 // is available before sign-in completes.
-class SigninManagerAndroid {
+class SigninManagerAndroid : public GoogleAutoLoginHelper::Observer {
  public:
   SigninManagerAndroid(JNIEnv* env, jobject obj);
 
@@ -61,6 +63,11 @@ class SigninManagerAndroid {
 
   void OnBrowsingDataRemoverDone();
 
+  // GoogleAutoLoginHelper::Observer implementation.
+  virtual void MergeSessionCompleted(
+      const std::string& account_id,
+      const GoogleServiceAuthError& error) OVERRIDE;
+
   Profile* profile_;
 
   // Java-side SigninManager object.
@@ -77,6 +84,9 @@ class SigninManagerAndroid {
   std::string username_;
 #endif
 
+  // Helper to merge the signed into account into the cookie jar session.
+  scoped_ptr<GoogleAutoLoginHelper> merge_session_helper_;
+
   base::WeakPtrFactory<SigninManagerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninManagerAndroid);