Added interstitial page for merge session.

chrome/browser/chromeos/login/login_utils.cc

Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index e1874f9f3b92007fa1b3c5a935892fb603d0af86..482174c5921dc52e247d5e1571c7438424add8e8 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -229,6 +229,7 @@ class LoginUtilsImpl
   virtual void InitRlzDelayed(Profile* user_profile) OVERRIDE;
 
   // OAuthLoginManager::Delegate overrides.
+  virtual void OnCompletedMergeSession() OVERRIDE;
   virtual void OnCompletedAuthentication(Profile* user_profile) OVERRIDE;
   virtual void OnFoundStoredTokens() OVERRIDE;
 
@@ -561,6 +562,8 @@ void LoginUtilsImpl::RestoreAuthSession(Profile* user_profile,
   if (!login_manager_.get())
     return;
 
+  UserManager::Get()->SetMergeSessionState(
+      UserManager::MERGE_STATUS_IN_PROCESS);
   // Remove legacy OAuth1 token if we have one. If it's valid, we should already
   // have OAuth2 refresh token in TokenService that could be used to retrieve
   // all other tokens and credentials.
@@ -997,6 +1000,10 @@ void LoginUtilsImpl::OnCompletedAuthentication(Profile* user_profile) {
   StartSignedInServices(user_profile);
 }
 
+void LoginUtilsImpl::OnCompletedMergeSession() {
+  UserManager::Get()->SetMergeSessionState(UserManager::MERGE_STATUS_DONE);
+}
+
 void LoginUtilsImpl::OnFoundStoredTokens() {
   // We don't need authenticator instance any more since its cookie jar
   // is not going to needed to mint OAuth tokens. Reset it so that