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..f3b51c1452407f2da524d80d5d60951579bb194d 100644
--- a/chrome/browser/chromeos/login/user_manager.h
+++ b/chrome/browser/chromeos/login/user_manager.h
@@ -24,9 +24,11 @@ class UserManager {
   // 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.
+    // Session merge can't start yet until we get the refresh token.
+    MERGE_STATUS_UNINITILIZED,
+    // Session merge fetching hasn't started yet.
+    MERGE_STATUS_PREPARING,
+    // Session merge related requests to GAIA are in progress.
     MERGE_STATUS_IN_PROCESS,
     // Session merge is completed.
     MERGE_STATUS_DONE,
@@ -301,6 +303,10 @@ class UserManager {
   // or restart after crash.
   virtual bool IsSessionStarted() const = 0;
 
+  // Returns session duration in seconds. If the session hasn't started yet,
+  // the function returns -1.
+  virtual int64 GetSessionDurationInSeconds() const = 0;
+
   // Returns true iff browser has been restarted after crash and UserManager
   // finished restoring user sessions.
   virtual bool UserSessionsRestored() const = 0;