Merge "cros: Fix flaky owner detection"

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 1811306000fc18dcfc0bc2486f81c1ba535a0ac9..ed16c87c640e55784eaced42d9dfcb6a7085ac57 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -458,7 +458,6 @@ void ChromeUserManagerImpl::Observe(
           device_local_account_policy_service_->AddObserver(this);
       }
       RetrieveTrustedDevicePolicies();
-      UpdateOwnership();
       break;
     case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: {
       Profile* profile = content::Details<Profile>(details).ptr();
@@ -948,14 +947,6 @@ void ChromeUserManagerImpl::NotifyOnLogin() {
   UserSessionManager::GetInstance()->PerformPostUserLoggedInActions();
 }
 
-void ChromeUserManagerImpl::UpdateOwnership() {
-  bool is_owner =
-      FakeOwnership() || DeviceSettingsService::Get()->HasPrivateOwnerKey();
-  VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner");
-
-  SetCurrentUserIsOwner(is_owner);
-}
-
 void ChromeUserManagerImpl::RemoveNonCryptohomeData(
     const AccountId& account_id) {
   ChromeUserManager::RemoveNonCryptohomeData(account_id);