UserManager stack refactoring.

components/user_manager/user_manager_base.h

 // Copyright 2014 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 COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 118 matching lines @@
   virtual void DeleteUser(User* user);
 
   // Returns the locale used by the application.
   virtual const std::string& GetApplicationLocale() const = 0;
 
   // Returns "Local State" PrefService instance.
   virtual PrefService* GetLocalState() const = 0;
 
   // Loads |users_| from Local State if the list has not been loaded yet.
   // Subsequent calls have no effect. Must be called on the UI thread.
-  void EnsureUsersLoaded();
+  virtual void EnsureUsersLoaded();
 
   // Handle OAuth token |status| change for |user_id|.
   virtual void HandleUserOAuthTokenStatusChange(
       const std::string& user_id,
       User::OAuthTokenStatus status) const = 0;
 
   // Returns true if device is enterprise managed.
   virtual bool IsEnterpriseManaged() const = 0;
 
   // Helper function that copies users from |users_list| to |users_vector| and
@@ skipping 103 matching lines @@
 
   // The primary user of the current session. It is recorded for the first
   // signed-in user and does not change thereafter.
   User* primary_user_;
 
   // List of all known users. User instances are owned by |this|. Regular users
   // are removed by |RemoveUserFromList|, public accounts by
   // |UpdateAndCleanUpPublicAccounts|.
   UserList users_;
 
+  // List of all users that are logged in current session. These point to User
+  // instances in |users_|. Only one of them could be marked as active.
+  UserList logged_in_users_;
+
+  // A list of all users that are logged in the current session. In contrast to
+  // |logged_in_users|, the order of this list is least recently used so that
+  // the active user should always be the first one in the list.
+  UserList lru_logged_in_users_;
+
  private:
   // Stages of loading user list from preferences. Some methods can have
   // different behavior depending on stage.
   enum UserLoadStage { STAGE_NOT_LOADED = 0, STAGE_LOADING, STAGE_LOADED };
 
   // Returns a list of users who have logged into this device previously.
   // Same as GetUsers but used if you need to modify User from that list.
   UserList& GetUsersAndModify();
 
   // Returns the user with the given email address if found in the persistent
@@ skipping 36 matching lines @@
   virtual void UpdateUserAccountLocale(const std::string& user_id,
                                        const std::string& locale);
 
   // Updates user account after locale was resolved.
   void DoUpdateAccountLocale(const std::string& user_id,
                              scoped_ptr<std::string> resolved_locale);
 
   // Indicates stage of loading user from prefs.
   UserLoadStage user_loading_stage_;
 
-  // List of all users that are logged in current session. These point to User
-  // instances in |users_|. Only one of them could be marked as active.
-  UserList logged_in_users_;
-
-  // A list of all users that are logged in the current session. In contrast to
-  // |logged_in_users|, the order of this list is least recently used so that
-  // the active user should always be the first one in the list.
-  UserList lru_logged_in_users_;
-
   // True if SessionStarted() has been called.
   bool session_started_;
 
   // Cached flag of whether currently logged-in user is owner or not.
   // May be accessed on different threads, requires locking.
   bool is_current_user_owner_;
   mutable base::Lock is_current_user_owner_lock_;
 
   // Cached flag of whether the currently logged-in user existed before this
   // login.
@@ skipping 41 matching lines @@
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_