cros: Remove Supervised feature flags that been enabled for a long time

Bug: 866790
Change-Id: I8f9f3c567717f36e91f8a8f12b42124f4114ed03
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340913
Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795547}

ash/login/ui/lock_contents_view.cc

@@ -29,7 +29,6 @@
 #include "ash/login/ui/system_label_button.h"
 #include "ash/login/ui/views_utils.h"
 #include "ash/media/media_controller_impl.h"
-#include "ash/public/cpp/ash_features.h"
 #include "ash/public/cpp/ash_switches.h"
 #include "ash/public/cpp/login_accelerators.h"
 #include "ash/public/cpp/login_types.h"
@@ -1881,8 +1880,7 @@ void LockContentsView::OnBigUserChanged() {
   UpdateEasyUnlockIconForUser(big_user_account_id);
 
   // http://crbug/866790: After Supervised Users are deprecated, remove this.
-  if (features::IsSupervisedUserDeprecationNoticeEnabled() &&
-      big_user.basic_user_info.type == user_manager::USER_TYPE_SUPERVISED) {
+  if (big_user.basic_user_info.type == user_manager::USER_TYPE_SUPERVISED) {
     base::string16 message = l10n_util::GetStringUTF16(
         IDS_ASH_LOGIN_POD_LEGACY_SUPERVISED_EXPIRATION_WARNING);
     // Shows supervised user deprecation message as a persistent error bubble.

ash/public/cpp/ash_features.cc

@@ -100,9 +100,6 @@ const base::Feature kTrilinearFiltering{"TrilinearFiltering",
 const base::Feature kUseBluetoothSystemInAsh{"UseBluetoothSystemInAsh",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kSupervisedUserDeprecationNotice{
-    "SupervisedUserDeprecationNotice", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kSwapSideVolumeButtonsForOrientation{
     "SwapSideVolumeButtonsForOrientation", base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ -199,10 +196,6 @@ bool IsTrilinearFilteringEnabled() {
   return use_trilinear_filtering;
 }
 
-bool IsSupervisedUserDeprecationNoticeEnabled() {
-  return base::FeatureList::IsEnabled(kSupervisedUserDeprecationNotice);
-}
-
 bool IsSwapSideVolumeButtonsForOrientationEnabled() {
   return base::FeatureList::IsEnabled(kSwapSideVolumeButtonsForOrientation);
 }

ash/public/cpp/ash_features.h

@@ -122,9 +122,6 @@ ASH_PUBLIC_EXPORT extern const base::Feature kTrilinearFiltering;
 // Enables using the BluetoothSystem Mojo interface for Bluetooth operations.
 ASH_PUBLIC_EXPORT extern const base::Feature kUseBluetoothSystemInAsh;
 
-// Enables the Supervised User Deprecation notices.
-ASH_PUBLIC_EXPORT extern const base::Feature kSupervisedUserDeprecationNotice;
-
 // Enables side volume button control based on screen orientation feature.
 // TODO(https://crbug.com/937907): Remove this after the feature is fully
 // launched.
@@ -200,8 +197,6 @@ ASH_PUBLIC_EXPORT bool IsSeparateNetworkIconsEnabled();
 
 ASH_PUBLIC_EXPORT bool IsTrilinearFilteringEnabled();
 
-ASH_PUBLIC_EXPORT bool IsSupervisedUserDeprecationNoticeEnabled();
-
 ASH_PUBLIC_EXPORT bool IsSwapSideVolumeButtonsForOrientationEnabled();
 
 ASH_PUBLIC_EXPORT bool IsBackgroundBlurEnabled();

chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -13,7 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_features.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "base/base_paths.h"
@@ -1436,15 +1435,13 @@ void UserSessionManager::UserProfileInitialized(Profile* profile,
   os_sync_util::MigrateOsSyncPreferences(profile->GetPrefs());
 
   // http://crbug/866790: After Supervised Users are deprecated, remove this.
-  if (ash::features::IsSupervisedUserDeprecationNoticeEnabled()) {
-    bool is_supervised_user =
-        user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser();
-    bool is_manager = ChromeUserManager::Get()
-                          ->GetSupervisedUserManager()
-                          ->HasSupervisedUsers(account_id.GetUserEmail());
-    if (is_manager || is_supervised_user)
-      ShowSupervisedUserDeprecationNotification(profile, is_manager);
-  }
+  bool is_supervised_user =
+      user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser();
+  bool is_manager =
+      ChromeUserManager::Get()->GetSupervisedUserManager()->HasSupervisedUsers(
+          account_id.GetUserEmail());
+  if (is_manager || is_supervised_user)
+    ShowSupervisedUserDeprecationNotification(profile, is_manager);
 
   // Demo user signed in.
   if (is_incognito_profile) {
@@ -1754,9 +1751,7 @@ bool UserSessionManager::InitializeUserSession(Profile* profile) {
 
       ActivateWizard(TermsOfServiceScreenView::kScreenId);
       return false;
-    } else if (base::FeatureList::IsEnabled(
-                   chromeos::features::kEnableSupervisionTransitionScreens) &&
-               !user_manager->IsCurrentUserNew() &&
+    } else if (!user_manager->IsCurrentUserNew() &&
                arc::GetSupervisionTransition(profile) !=
                    arc::ArcSupervisionTransition::NO_TRANSITION) {
       ActivateWizard(SupervisionTransitionScreenView::kScreenId);

chromeos/constants/chromeos_features.cc

@@ -222,11 +222,6 @@ const base::Feature kClipboardHistory{"ClipboardHistory",
 const base::Feature kEnableImeSandbox{"EnableImeSandbox",
                                       base::FEATURE_DISABLED_BY_DEFAULT};
 
-// If enabled, will display blocking screens during re-authentication after a
-// supervision transition occurred.
-const base::Feature kEnableSupervisionTransitionScreens{
-    "EnableSupervisionTransitionScreens", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enable restriction of symlink traversal on user-supplied filesystems.
 const base::Feature kFsNosymfollow{"FsNosymfollow",
                                    base::FEATURE_DISABLED_BY_DEFAULT};

chromeos/constants/chromeos_features.h

@@ -100,8 +100,6 @@ COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kClipboardHistory;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kEnableImeSandbox;
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
-extern const base::Feature kEnableSupervisionTransitionScreens;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const base::Feature kFsNosymfollow;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kGaiaActionButtons;