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

chrome/browser/signin/signin_tracker.cc

 // Copyright (c) 2012 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/signin_tracker.h"
 
 #include "chrome/browser/chrome_notification_types.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/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 SigninTracker::SigninTracker(Profile* profile, Observer* observer)
     : profile_(profile), observer_(observer) {
   DCHECK(profile_);
   Initialize();
 }
 
 SigninTracker::~SigninTracker() {
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
       RemoveObserver(this);
 }
 
 void SigninTracker::Initialize() {
   DCHECK(observer_);
 
-  // Register for notifications from the SigninManager.
+  // Register for notifications from the SigninManager and sign in helper.
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                  content::Source<Profile>(profile_));
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_MERGE_SESSION_COMPLETE,
+                 content::Source<Profile>(profile_));
 
   OAuth2TokenService* token_service =
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   token_service->AddObserver(this);
 }
 
 void SigninTracker::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED, type);
-
-  // We should not get more than one of these notifications.
-  const GoogleServiceAuthError& error =
-      *(content::Details<const GoogleServiceAuthError>(details).ptr());
-  observer_->SigninFailed(error);
+  switch (type) {
+    case chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED: {
+      // We should not get more than one of these notifications.
+      const GoogleServiceAuthError& error =
+          *(content::Details<const GoogleServiceAuthError>(details).ptr());
+      observer_->SigninFailed(error);
+      break;
+    }
+    case chrome::NOTIFICATION_MERGE_SESSION_COMPLETE: {
+      const GoogleAutoLoginHelper::MergeSessionDetails* merge_details =
+          content::Details<const GoogleAutoLoginHelper::MergeSessionDetails>(
+              details).ptr();
+      observer_->MergeSessionComplete(merge_details->error);
+      break;
+    }
+    default:
+      NOTREACHED() << "Type: " << type;
+      break;
+  }
 }
 
 void SigninTracker::OnRefreshTokenAvailable(const std::string& account_id) {
   // TODO: when OAuth2TokenService handles multi-login, this should check
   // that |account_id| is the primary account before signalling success.
   observer_->SigninSuccess();
 }
 
 void SigninTracker::OnRefreshTokenRevoked(const std::string& account_id) {
   NOTREACHED();
 }