OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/user_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 
 class PrefRegistrySimple;
 
 namespace chromeos {
 
 class RemoveUserDelegate;
 class UserImageManager;
 
 // Base class for UserManagerImpl - provides a mechanism for discovering users
 // 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.
+    // 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,
   };
 
   // Interface that observers of UserManager must implement in order
   // to receive notification when local state preferences is changed
   class Observer {
    public:
     // Called when the local state preferences is changed.
@@ skipping 254 matching lines @@
   virtual bool IsLoggedInAsKioskApp() const = 0;
 
   // Returns true if we're logged in as the stub user used for testing on Linux.
   virtual bool IsLoggedInAsStub() const = 0;
 
   // Returns true if we're logged in and browser has been started i.e.
   // browser_creator.LaunchBrowser(...) was called after sign in
   // 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;
 
   // Returns merge session status.
   virtual MergeSessionState GetMergeSessionState() const = 0;
 
   // Changes merge session status.
   virtual void SetMergeSessionState(MergeSessionState status) = 0;
 
@@ skipping 88 matching lines @@
   ScopedTestUserManager();
   ~ScopedTestUserManager();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_