Preference dis/allowing supervised users creation is now available as owner setting, not only as de…

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

Index: chrome/browser/chromeos/login/users/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/user_manager_impl.cc b/chrome/browser/chromeos/login/users/user_manager_impl.cc
index 86bf5da27df83aacbfeb3e2acbe9005088a5e027..4434db2229492ad18f3b428f1f9053729c2d3267 100644
--- a/chrome/browser/chromeos/login/users/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_impl.cc
@@ -232,10 +232,6 @@ UserManagerImpl::UserManagerImpl()
       kAccountsPrefDeviceLocalAccounts,
       base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
                  base::Unretained(this)));
-  supervised_users_subscription_ = cros_settings_->AddSettingsObserver(
-      kAccountsPrefSupervisedUsersEnabled,
-      base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
-                 base::Unretained(this)));
   multi_profile_user_controller_.reset(new MultiProfileUserController(
       this, g_browser_process->local_state()));
 
@@ -276,7 +272,6 @@ UserManagerImpl::~UserManagerImpl() {
 void UserManagerImpl::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   local_accounts_subscription_.reset();
-  supervised_users_subscription_.reset();
   // Stop the session length limiter.
   session_length_limiter_.reset();
 
@@ -1858,9 +1853,7 @@ bool UserManagerImpl::AreLocallyManagedUsersAllowed() const {
   bool locally_managed_users_allowed = false;
   cros_settings_->GetBoolean(kAccountsPrefSupervisedUsersEnabled,
                              &locally_managed_users_allowed);
-  policy::BrowserPolicyConnectorChromeOS* connector =
-      g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  return locally_managed_users_allowed || !connector->IsEnterpriseManaged();
+  return locally_managed_users_allowed;
 }
 
 base::FilePath UserManagerImpl::GetUserProfileDir(