OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/user_manager_impl.cc

Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 2caa38ad1d4f503d7995344d85e1b4adefc5d82d..d5c776eab854db8cd8d1b7697e536f97f6ff4c4c 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -223,7 +223,6 @@ UserManagerImpl::UserManagerImpl()
       is_current_user_new_(false),
       is_current_user_ephemeral_regular_user_(false),
       ephemeral_users_enabled_(false),
-      merge_session_state_(MERGE_STATUS_NOT_STARTED),
       observed_sync_service_(NULL),
       user_image_manager_(new UserImageManagerImpl),
       manager_creation_time_(base::TimeTicks::Now()) {
@@ -910,19 +909,6 @@ bool UserManagerImpl::UserSessionsRestored() const {
   return user_sessions_restored_;
 }
 
-UserManager::MergeSessionState UserManagerImpl::GetMergeSessionState() const {
-  return merge_session_state_;
-}
-
-void UserManagerImpl::SetMergeSessionState(
-    UserManager::MergeSessionState state) {
-  if (merge_session_state_ == state)
-    return;
-
-  merge_session_state_ = state;
-  NotifyMergeSessionStateChanged();
-}
-
 bool UserManagerImpl::HasBrowserRestarted() const {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return base::chromeos::IsRunningOnChromeOS() &&
@@ -1668,12 +1654,6 @@ void UserManagerImpl::NotifyUserListChanged() {
       content::NotificationService::NoDetails());
 }
 
-void UserManagerImpl::NotifyMergeSessionStateChanged() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  FOR_EACH_OBSERVER(UserManager::Observer, observer_list_,
-                    MergeSessionStateChanged(merge_session_state_));
-}
-
 void UserManagerImpl::NotifyActiveUserChanged(const User* active_user) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,