Merge "cros: Fix flaky owner detection"

components/user_manager/user_manager_base.h

Index: components/user_manager/user_manager_base.h
diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index b30015f0ecc7333939cdd05a1d728a1a99e2f94a..9e9fec639190d7eeedabd366d987c1a912830357 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h
@@ -250,8 +250,6 @@ class USER_MANAGER_EXPORT UserManagerBase : public UserManager {
 
   // Getters/setters for private members.
 
-  virtual void SetCurrentUserIsOwner(bool is_current_user_owner);
-
   virtual bool GetEphemeralUsersEnabled() const;
   virtual void SetEphemeralUsersEnabled(bool enabled);
 
@@ -340,11 +338,6 @@ class USER_MANAGER_EXPORT UserManagerBase : public UserManager {
   // 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;