Merge 182894 - 3rd attempt

chrome/browser/chromeos/login/login_utils.cc

Index: chrome/browser/chromeos/login/login_utils.cc
===================================================================
--- chrome/browser/chromeos/login/login_utils.cc	(revision 184220)
+++ chrome/browser/chromeos/login/login_utils.cc	(working copy)
@@ -227,6 +227,7 @@
   virtual void CompleteProfileCreate(Profile* user_profile) OVERRIDE;
 
   // OAuthLoginManager::Delegate overrides.
+  virtual void OnCompletedMergeSession() OVERRIDE;
   virtual void OnCompletedAuthentication(Profile* user_profile) OVERRIDE;
   virtual void OnFoundStoredTokens() OVERRIDE;
 
@@ -519,6 +520,8 @@
 void LoginUtilsImpl::RestoreAuthSession(Profile* user_profile,
                                         bool restore_from_auth_cookies) {
   DCHECK(authenticator_ || !restore_from_auth_cookies);
+  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.
@@ -954,6 +957,10 @@
   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