OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/user_manager.h

Index: chrome/browser/chromeos/login/user_manager.h
diff --git a/chrome/browser/chromeos/login/user_manager.h b/chrome/browser/chromeos/login/user_manager.h
index 4bd8b85c2e7ff4236baeb6e1f2af16e708ab68bd..b807bf47eecd5438c061750448551eb36ba068eb 100644
--- a/chrome/browser/chromeos/login/user_manager.h
+++ b/chrome/browser/chromeos/login/user_manager.h
@@ -21,17 +21,6 @@ class UserImageManager;
 // who have logged into this Chrome OS device before and updating that list.
 class UserManager {
  public:
-  // Status of merge sessions process which is responsible for exchanging
-  // user OAuth2 refresh token for GAIA cookies.
-  enum MergeSessionState {
-    // Session merge hasn't started yet.
-    MERGE_STATUS_NOT_STARTED,
-    // Session merge is in process.
-    MERGE_STATUS_IN_PROCESS,
-    // Session merge is completed.
-    MERGE_STATUS_DONE,
-  };
-
   // Interface that observers of UserManager must implement in order
   // to receive notification when local state preferences is changed
   class Observer {
@@ -39,9 +28,6 @@ class UserManager {
     // Called when the local state preferences is changed.
     virtual void LocalStateChanged(UserManager* user_manager);
 
-    // Called when merge session state is changed.
-    virtual void MergeSessionStateChanged(MergeSessionState state);
-
    protected:
     virtual ~Observer();
   };
@@ -305,12 +291,6 @@ class UserManager {
   // finished restoring user sessions.
   virtual bool UserSessionsRestored() const = 0;
 
-  // Returns merge session status.
-  virtual MergeSessionState GetMergeSessionState() const = 0;
-
-  // Changes merge session status.
-  virtual void SetMergeSessionState(MergeSessionState status) = 0;
-
   // Returns true when the browser has crashed and restarted during the current
   // user's session.
   virtual bool HasBrowserRestarted() const = 0;