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

chrome/browser/chromeos/login/user_manager_impl.cc

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 b6e1b27ba056801e7555d756e0d8960851feace6..cad19f8e02dddd6aae14a14c17e3356fc7dc9eb8 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -230,10 +230,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()));
 
@@ -1834,12 +1830,10 @@ void UserManagerImpl::SetAppModeChromeClientOAuthInfo(
 }
 
 bool UserManagerImpl::AreLocallyManagedUsersAllowed() const {
-  bool locally_managed_users_allowed = false;
+  bool locally_managed_users_allowed = true;

[Nikita (slow), 2014/04/08 14:02:09]

As discussed: this is not the correct way to set the default value for the
consumer device.

Please find a proper way to set correct defaults for this feature for enterprise
and consumer cases.

I think defaults should be different:

consumer: enabled by default
enterprise: disabled by default (i.e. enabled only by the policy).

[merkulova, 2014/04/09 15:24:19]

Done.

   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(