Remove SupervisedUser policies for chrome and chromeos

Both policies are deprecated and will always be false.

Remove SupervisedUsersEnabled code, for ChromeOS
Remove SupervisedUserCreationEnabled code, for Chrome
Signed-off-by: Guido Trotter <ultrotter@chromium.org>
Bug: 834488
Change-Id: Iab2fad3d396ab5d68bbd0072da742fadeb64d367
Reviewed-on: https://chromium-review.googlesource.com/1224033Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592828}

chrome/browser/BUILD.gn

@@ -4404,12 +4404,6 @@ jumbo_split_static_library("browser") {
       "supervised_user/supervised_user_theme.h",
     ]
   }
-  if (enable_supervised_users && !is_android && !is_chromeos) {
-    sources += [
-      "supervised_user/supervised_user_creation_policy_handler.cc",
-      "supervised_user/supervised_user_creation_policy_handler.h",
-    ]
-  }
 
   if (enable_vr) {
     if (enable_gvr_services) {

chrome/browser/chromeos/login/login_screen_policy_browsertest.cc

@@ -66,17 +66,6 @@ void LoginScreenPolicyTest::RefreshDevicePolicyAndWaitForSettingChange(
   runner->Run();
 }
 
-IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DisableSupervisedUsers) {
-  EXPECT_FALSE(user_manager::UserManager::Get()->AreSupervisedUsersAllowed());
-
-  em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
-  proto.mutable_supervised_users_settings()->set_supervised_users_enabled(true);
-  RefreshDevicePolicyAndWaitForSettingChange(
-      chromeos::kAccountsPrefSupervisedUsersEnabled);
-
-  EXPECT_TRUE(user_manager::UserManager::Get()->AreSupervisedUsersAllowed());
-}
-
 IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, RestrictInputMethods) {
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,

chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

@@ -239,18 +239,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
     }
   }
 
-  if (policy.has_supervised_users_settings()) {
-    const em::SupervisedUsersSettingsProto& container =
-        policy.supervised_users_settings();
-    if (container.has_supervised_users_enabled()) {
-      policies->Set(
-          key::kSupervisedUsersEnabled, POLICY_LEVEL_MANDATORY,
-          POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-          std::make_unique<base::Value>(container.supervised_users_enabled()),
-          nullptr);
-    }
-  }
-
   if (policy.has_saml_settings()) {
     const em::SAMLSettingsProto& container(policy.saml_settings());
     if (container.has_transfer_saml_cookies()) {

chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -180,16 +180,8 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
       policy.guest_mode_enabled().guest_mode_enabled());
 
   bool supervised_users_enabled = false;
-  if (InstallAttributes::Get()->IsEnterpriseManaged()) {
-    supervised_users_enabled =
-        policy.has_supervised_users_settings() &&
-        policy.supervised_users_settings().has_supervised_users_enabled() &&
-        policy.supervised_users_settings().supervised_users_enabled();
-  } else {
-    supervised_users_enabled =
-        !policy.has_supervised_users_settings() ||
-        !policy.supervised_users_settings().has_supervised_users_enabled() ||
-        policy.supervised_users_settings().supervised_users_enabled();
+  if (!InstallAttributes::Get()->IsEnterpriseManaged()) {
+    supervised_users_enabled = true;
   }
   new_values_cache->SetBoolean(
       kAccountsPrefSupervisedUsersEnabled, supervised_users_enabled);

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
 #include "chrome/browser/spellchecker/spellcheck_language_policy_handler.h"
 #include "chrome/browser/ssl/secure_origin_policy_handler.h"
-#include "chrome/browser/supervised_user/supervised_user_creation_policy_handler.h"
 #include "chrome/common/buildflags.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -1061,7 +1060,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
       std::make_unique<extensions::NativeMessagingHostListPolicyHandler>(
           key::kNativeMessagingBlacklist,
           extensions::pref_names::kNativeMessagingBlacklist, true));
-  handlers->AddHandler(std::make_unique<SupervisedUserCreationPolicyHandler>());
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 
 #if !defined(OS_ANDROID)

chrome/browser/supervised_user/supervised_user_creation_policy_handler.cc

-// Copyright 2016 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/supervised_user/supervised_user_creation_policy_handler.h"
-
-#include "base/values.h"
-#include "chrome/common/pref_names.h"
-#include "components/policy/core/common/policy_map.h"
-#include "components/policy/policy_constants.h"
-#include "components/prefs/pref_value_map.h"
-
-namespace policy {
-
-SupervisedUserCreationPolicyHandler::SupervisedUserCreationPolicyHandler()
-    : TypeCheckingPolicyHandler(key::kSupervisedUserCreationEnabled,
-                                base::Value::Type::BOOLEAN) {}
-
-SupervisedUserCreationPolicyHandler::~SupervisedUserCreationPolicyHandler() {}
-
-void SupervisedUserCreationPolicyHandler::ApplyPolicySettings(
-    const PolicyMap& policies,
-    PrefValueMap* prefs) {
-  // If force sign in is enabled, disable supervised user creation regardless.
-  const base::Value* force_signin_value =
-      policies.GetValue(key::kForceBrowserSignin);
-  bool is_force_signin_enabled;
-  if (force_signin_value &&
-      force_signin_value->GetAsBoolean(&is_force_signin_enabled) &&
-      is_force_signin_enabled) {
-    prefs->SetBoolean(prefs::kSupervisedUserCreationAllowed, false);
-    return;
-  }
-
-  const base::Value* creation_value = policies.GetValue(policy_name());
-  bool is_creation_enabled;
-  if (creation_value && creation_value->GetAsBoolean(&is_creation_enabled)) {
-    prefs->SetBoolean(prefs::kSupervisedUserCreationAllowed,
-                      is_creation_enabled);
-  }
-}
-
-}  // namespace policy

chrome/browser/supervised_user/supervised_user_creation_policy_handler.h

-// Copyright 2016 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.
-
-#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_CREATION_POLICY_HANDLER_H_
-#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_CREATION_POLICY_HANDLER_H_
-
-#include "base/macros.h"
-#include "components/policy/core/browser/configuration_policy_handler.h"
-
-class PrefValueMap;
-
-namespace policy {
-
-class PolicyMap;
-
-class SupervisedUserCreationPolicyHandler : public TypeCheckingPolicyHandler {
- public:
-  SupervisedUserCreationPolicyHandler();
-  ~SupervisedUserCreationPolicyHandler() override;
-
-  void ApplyPolicySettings(const PolicyMap& policies,
-                           PrefValueMap* prefs) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationPolicyHandler);
-};
-
-}  // namespace policy
-
-#endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_CREATION_POLICY_HANDLER_H_

chrome/browser/supervised_user/supervised_user_creation_policy_handler_unittest.cc

-// Copyright 2016 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/supervised_user/supervised_user_creation_policy_handler.h"
-
-#include "base/values.h"
-#include "chrome/common/pref_names.h"
-#include "components/policy/core/common/policy_map.h"
-#include "components/policy/policy_constants.h"
-#include "components/prefs/pref_value_map.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace policy {
-
-class SupervisedUserCreationPolicyHandlerTest : public ::testing::Test {
- protected:
-  void SetUpPolicyAndApply(const char* policy_name, bool value) {
-    policies_.Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-                  POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(value),
-                  nullptr);
-    ApplyPolicySettings();
-  }
-
-  void ApplyPolicySettings() {
-    handler_.ApplyPolicySettings(policies_, &prefs_);
-  }
-
-  PrefValueMap* prefs() { return &prefs_; }
-
- private:
-  PolicyMap policies_;
-  PrefValueMap prefs_;
-  SupervisedUserCreationPolicyHandler handler_;
-};
-
-TEST_F(SupervisedUserCreationPolicyHandlerTest, ForceSigninNotSet) {
-  ApplyPolicySettings();
-  EXPECT_FALSE(
-      prefs()->GetValue(prefs::kSupervisedUserCreationAllowed, nullptr));
-
-  bool value;
-  SetUpPolicyAndApply(key::kSupervisedUserCreationEnabled, true);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_TRUE(value);
-
-  SetUpPolicyAndApply(key::kSupervisedUserCreationEnabled, false);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_FALSE(value);
-}
-
-TEST_F(SupervisedUserCreationPolicyHandlerTest, ForceSigninDisabled) {
-  SetUpPolicyAndApply(key::kForceBrowserSignin, false);
-  EXPECT_FALSE(
-      prefs()->GetValue(prefs::kSupervisedUserCreationAllowed, nullptr));
-
-  bool value;
-  SetUpPolicyAndApply(key::kSupervisedUserCreationEnabled, true);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_TRUE(value);
-
-  SetUpPolicyAndApply(key::kSupervisedUserCreationEnabled, false);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_FALSE(value);
-}
-
-TEST_F(SupervisedUserCreationPolicyHandlerTest, ForceSigninEnabled) {
-  bool value;
-  SetUpPolicyAndApply(key::kForceBrowserSignin, true);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_FALSE(value);
-
-  // When force sign in is enabled, the supervised user creation will be
-  // disabled even if the policy is set to true.
-  SetUpPolicyAndApply(key::kSupervisedUserCreationEnabled, true);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_FALSE(value);
-
-  SetUpPolicyAndApply(key::kSupervisedUserCreationEnabled, false);
-  EXPECT_TRUE(
-      prefs()->GetBoolean(prefs::kSupervisedUserCreationAllowed, &value));
-  EXPECT_FALSE(value);
-}
-
-}  // namespace policy

chrome/test/BUILD.gn

@@ -4497,9 +4497,6 @@ test("unit_tests") {
       "../browser/supervised_user/supervised_user_whitelist_service_unittest.cc",
     ]
   }
-  if (enable_supervised_users && !is_android && !is_chromeos) {
-    sources += [ "../browser/supervised_user/supervised_user_creation_policy_handler_unittest.cc" ]
-  }
   if (safe_browsing_mode == 1 && enable_extensions) {
     sources += [ "../browser/extensions/blacklist_unittest.cc" ]
   }

testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter

@@ -198,9 +198,6 @@
 # Lock screen tests.
 -LockScreenNoteTakingTest.Launch
 
-# Login screen tests.
--LoginScreenPolicyTest.DisableSupervisedUsers
-
 # PRE steps crash on shutdown.
 # FATAL:ref_counted.h(85)] Check failed: CalledOnValidSequence()
 -ManagedWithoutPermission/ManagedWithoutPermissionPlatformKeysTest.*