Merge "cros: Fix flaky owner detection"

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 <map>
 #include <memory>
 #include <set>
@@ skipping 232 matching lines @@
   // Should be called when regular user was removed.
   virtual void OnUserRemoved(const AccountId& account_id) = 0;
 
   // Update the global LoginState.
   virtual void UpdateLoginState(const User* active_user,
                                 const User* primary_user,
                                 bool is_current_user_owner) const = 0;
 
   // Getters/setters for private members.
 
-  virtual void SetCurrentUserIsOwner(bool is_current_user_owner);
-
   virtual bool GetEphemeralUsersEnabled() const;
   virtual void SetEphemeralUsersEnabled(bool enabled);
 
   virtual void SetOwnerId(const AccountId& owner_account_id);
 
   virtual const AccountId& GetPendingUserSwitchID() const;
   virtual void SetPendingUserSwitchId(const AccountId& account_id);
 
   // The logged-in user that is currently active in current session.
   // NULL until a user has logged in, then points to one
@@ skipping 68 matching lines @@
   virtual void UpdateUserAccountLocale(const AccountId& account_id,
                                        const std::string& locale);
 
   // Updates user account after locale was resolved.
   void DoUpdateAccountLocale(const AccountId& account_id,
                              std::unique_ptr<std::string> resolved_locale);
 
   // Indicates stage of loading user from prefs.
   UserLoadStage user_loading_stage_ = STAGE_NOT_LOADED;
 
-  // 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_ = false;
-  mutable base::Lock is_current_user_owner_lock_;
-
   // Cached flag of whether the currently logged-in user existed before this
   // login.
   bool is_current_user_new_ = false;
 
   // Cached flag of whether the currently logged-in user is a regular user who
   // logged in as ephemeral. Storage of persistent information is avoided for
   // such users by not adding them to the persistent user list, not downloading
   // their custom avatars and mounting their cryptohomes using tmpfs. Defaults
   // to |false|.
   bool is_current_user_ephemeral_regular_user_ = false;
@@ skipping 30 matching lines @@
   scoped_refptr<base::TaskRunner> task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_