| Index: chrome/browser/chromeos/login/user_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
|
| index 7f27162939a9bfc15504455f5649e9d745ee8804..de8892a9eef41e5f1206c814683854a6177cdf30 100644
|
| --- a/chrome/browser/chromeos/login/user_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/login/user_manager_impl.cc
|
| @@ -926,14 +926,8 @@ void UserManagerImpl::Observe(int type,
|
| 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();
|
| @@ -1293,8 +1287,8 @@ void UserManagerImpl::RetrieveTrustedDevicePolicies() {
|
|
|
| // 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;
|
| }
|
|
|
|
|