Reintroduce proper checking for owner profile for the UI.

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 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/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 908 matching lines @@
     case chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED:
       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);
       }
-      // Making this call synchronously is not gonna cut it because
-      // notification order is not defined and in a single message loop run and
-      // getting trusted settings rely on a reload that happens on the very same
-      // notification observation.
-      base::MessageLoop::current()->PostTask(FROM_HERE,
-            base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
-                       base::Unretained(this)));
-      UserManagerImpl::UpdateOwnership();
+      RetrieveTrustedDevicePolicies();
+      UpdateOwnership();
       break;
     case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: {
       Profile* profile = content::Details<Profile>(details).ptr();
       if (IsUserLoggedIn() &&
           !IsLoggedInAsGuest() &&
           !IsLoggedInAsKioskApp()) {
         if (IsLoggedInAsLocallyManagedUser())
           ManagedUserPasswordServiceFactory::GetForProfile(profile);
         if (IsLoggedInAsRegularUser())
           ManagerPasswordServiceFactory::GetForProfile(profile);
@@ skipping 339 matching lines @@
     GetUserImageManager((*ui)->email())->LoadUserImage();
   }
 }
 
 void UserManagerImpl::RetrieveTrustedDevicePolicies() {
   ephemeral_users_enabled_ = false;
   owner_email_ = "";
 
   // Schedule a callback if device policy has not yet been verified.
   if (CrosSettingsProvider::TRUSTED != cros_settings_->PrepareTrustedValues(
-      base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
-                 base::Unretained(this)))) {
+          base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
+                     base::Unretained(this)))) {
     return;
   }
 
   cros_settings_->GetBoolean(kAccountsPrefEphemeralUsersEnabled,
                              &ephemeral_users_enabled_);
   cros_settings_->GetString(kDeviceOwner, &owner_email_);
 
   EnsureUsersLoaded();
 
   bool changed = UpdateAndCleanUpPublicAccounts(
@@ skipping 788 matching lines @@
 }
 
 void UserManagerImpl::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace chromeos