Merge "cros: Fix flaky owner detection"

chrome/browser/chromeos/login/users/chrome_user_manager_impl.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 CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 170 matching lines @@
   using UserImageManagerMap =
       base::hash_map<AccountId, linked_ptr<UserImageManager> >;
 
   ChromeUserManagerImpl();
 
   // Retrieves trusted device policies and removes users from the persistent
   // list if ephemeral users are enabled. Schedules a callback to itself if
   // trusted device policies are not yet available.
   void RetrieveTrustedDevicePolicies();
 
-  // Updates current user ownership on UI thread.
-  void UpdateOwnership();
-
   // If data for a device local account is marked as pending removal and the
   // user is no longer logged into that account, removes the data.
   void CleanUpDeviceLocalAccountNonCryptohomeDataPendingRemoval();
 
   // Removes data belonging to device local accounts that are no longer found on
   // the user list. If the user is currently logged into one of these accounts,
   // the data for that account is not removed immediately but marked as pending
   // removal after logout.
   void CleanUpDeviceLocalAccountNonCryptohomeData(
       const std::vector<std::string>& old_device_local_accounts);
@@ skipping 82 matching lines @@
   std::unique_ptr<BootstrapManager> bootstrap_manager_;
 
   base::WeakPtrFactory<ChromeUserManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_