Merge "cros: Fix flaky owner detection"

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

 // 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.
 
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 
 #include <stddef.h>
 
 #include <cstddef>
 #include <set>
@@ skipping 440 matching lines @@
       if (!device_local_account_policy_service_) {
         policy::BrowserPolicyConnectorChromeOS* connector =
             g_browser_process->platform_part()
                 ->browser_policy_connector_chromeos();
         device_local_account_policy_service_ =
             connector->GetDeviceLocalAccountPolicyService();
         if (device_local_account_policy_service_)
           device_local_account_policy_service_->AddObserver(this);
       }
       RetrieveTrustedDevicePolicies();
-      UpdateOwnership();
       break;
     case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: {
       Profile* profile = content::Details<Profile>(details).ptr();
       if (IsUserLoggedIn() && !IsLoggedInAsGuest() && !IsLoggedInAsKioskApp() &&
           !IsLoggedInAsArcKioskApp()) {
         if (IsLoggedInAsSupervisedUser())
           SupervisedUserPasswordServiceFactory::GetForProfile(profile);
         if (IsLoggedInAsUserWithGaiaAccount())
           ManagerPasswordServiceFactory::GetForProfile(profile);
 
@@ skipping 469 matching lines @@
   // TODO(nkostylev): Deprecate this notification in favor of
   // ActiveUserChanged() observer call.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const user_manager::User>(GetActiveUser()));
 
   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);
 
   WallpaperManager::Get()->RemoveUserWallpaperInfo(account_id);
   GetUserImageManager(account_id)->DeleteUserImage();
 
   supervised_user_manager_->RemoveNonCryptohomeData(account_id.GetUserEmail());
 
   multi_profile_user_controller_->RemoveCachedValues(account_id.GetUserEmail());
@@ skipping 403 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 
   return user;
 }
 
 }  // namespace chromeos