cros: Remove ChromeOSParentalControlsSettings feature flag

The feature launched more than half a year ago, so it's a
high time to cleanup. Also removed code in other files that
is related to this feature flag.

Bug: 1120085
Change-Id: Ia64376339f6aebbf20b7d494cda4e6d26a7785a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469234
Commit-Queue: Xiqi Ruan <xiqiruan@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817552}

chrome/browser/about_flags.cc

@@ -5592,13 +5592,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kFontAccessAPIDescription, kOsAll,
      FEATURE_VALUE_TYPE(blink::features::kFontAccess)},
 
-#if defined(OS_CHROMEOS)
-    {"enable-parental-controls-settings",
-     flag_descriptions::kEnableParentalControlsSettingsName,
-     flag_descriptions::kEnableParentalControlsSettingsDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(chromeos::features::kParentalControlsSettings)},
-#endif  // defined(OS_CHROMEOS)
-
     {"mouse-subframe-no-implicit-capture",
      flag_descriptions::kMouseSubframeNoImplicitCaptureName,
      flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll,

chrome/browser/flag-metadata.json

@@ -1918,13 +1918,6 @@
     // it can badly break pages under test.
     "expiry_milestone": -1
   },
-  {
-    "name": "enable-parental-controls-settings",
-    "owners": [ "danan", "michaelpg" ],
-    // This flag is used to enable parental controls options in ChromeOS
-    // settings.
-    "expiry_milestone": 79
-  },
   {
     "name": "enable-persistent-downloads",
     "owners": [ "ewannpv", "gambard", "bling-flags" ],

chrome/browser/flag_descriptions.cc

@@ -3982,11 +3982,6 @@ const char kEnablePalmSuppressionName[] =
 const char kEnablePalmSuppressionDescription[] =
     "If enabled, suppresses touch when a stylus is on a touchscreen.";
 
-const char kEnableParentalControlsSettingsName[] =
-    "Enable Parental controls settings";
-const char kEnableParentalControlsSettingsDescription[] =
-    "Enable Parental Control options in settings.";
-
 const char kEnablePlayStoreSearchName[] = "Enable Play Store search";
 const char kEnablePlayStoreSearchDescription[] =
     "Enable Play Store search in launcher.";

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -120,11 +120,11 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h"
+#include "chrome/browser/ui/webui/feed_internals/feed_internals_ui.h"
 #include "chrome/browser/ui/webui/offline/offline_internals_ui.h"
 #include "chrome/browser/ui/webui/webapks_ui.h"
 #include "components/feed/buildflags.h"
 #include "components/feed/feed_feature_list.h"
-#include "chrome/browser/ui/webui/feed_internals/feed_internals_ui.h"
 #else   // defined(OS_ANDROID)
 #include "chrome/browser/media/feeds/media_feeds_service.h"
 #include "chrome/browser/media/kaleidoscope/constants.h"
@@ -636,10 +636,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<chromeos::AccountManagerWelcomeUI>;
   if (url.host_piece() == chrome::kChromeUIAccountMigrationWelcomeHost)
     return &NewWebUI<chromeos::AccountMigrationWelcomeUI>;
-  if (chromeos::features::IsParentalControlsSettingsEnabled()) {
-    if (url.host_piece() == chrome::kChromeUIAddSupervisionHost)
-      return &NewWebUI<chromeos::AddSupervisionUI>;
-  }
+  if (url.host_piece() == chrome::kChromeUIAddSupervisionHost)
+    return &NewWebUI<chromeos::AddSupervisionUI>;
   if (url.host_piece() == chrome::kChromeUIBluetoothPairingHost)
     return &NewWebUI<chromeos::BluetoothPairingDialogUI>;
   if (url.host_piece() == chrome::kChromeUICellularSetupHost)

chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder_browsertest.cc

@@ -4,7 +4,6 @@
 
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/metrics/user_action_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision.mojom.h"
@@ -13,7 +12,6 @@
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "components/signin/public/identity_manager/identity_test_environment.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_web_ui.h"
@@ -27,12 +25,6 @@ class AddSupervisionMetricsRecorderTest : public InProcessBrowserTest {
   AddSupervisionMetricsRecorderTest() = default;
   ~AddSupervisionMetricsRecorderTest() override = default;
 
-  void SetUp() override {
-    feature_list_.InitAndEnableFeature(
-        chromeos::features::kParentalControlsSettings);
-    InProcessBrowserTest::SetUp();
-  }
-
   void SetUpOnMainThread() override {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
@@ -76,7 +68,6 @@ class AddSupervisionMetricsRecorderTest : public InProcessBrowserTest {
  private:
   DISALLOW_COPY_AND_ASSIGN(AddSupervisionMetricsRecorderTest);
 
-  base::test::ScopedFeatureList feature_list_;
   content::TestWebUI test_web_ui_;
 };
 

chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui_browsertest.cc

@@ -7,7 +7,6 @@
 #include "base/macros.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/metrics/user_action_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h"
@@ -15,7 +14,6 @@
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "components/signin/public/identity_manager/identity_test_environment.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test.h"
@@ -34,10 +32,7 @@ const char kGetAddSupervisionUIElementJS[] =
 // Base class for AddSupervision tests.
 class AddSupervisionBrowserTest : public InProcessBrowserTest {
  public:
-  AddSupervisionBrowserTest() {
-    scoped_feature_list_.InitWithFeatures(
-        {chromeos::features::kParentalControlsSettings}, {});
-  }
+  AddSupervisionBrowserTest() = default;
   ~AddSupervisionBrowserTest() override = default;
 
   void SetUpOnMainThread() override {
@@ -84,7 +79,6 @@ class AddSupervisionBrowserTest : public InProcessBrowserTest {
   }
 
  private:
-  base::test::ScopedFeatureList scoped_feature_list_;
   std::unique_ptr<signin::IdentityTestEnvironment> identity_test_env_;
 
   DISALLOW_COPY_AND_ASSIGN(AddSupervisionBrowserTest);

chrome/browser/ui/webui/settings/chromeos/os_settings_features_util.cc

@@ -9,7 +9,6 @@
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "components/arc/arc_features.h"
 #include "components/user_manager/user_manager.h"
 
@@ -23,9 +22,6 @@ bool IsGuestModeActive() {
 }
 
 bool ShouldShowParentalControlSettings(const Profile* profile) {
-  if (!chromeos::features::IsParentalControlsSettingsEnabled())
-    return false;
-
   // Not shown for secondary users.
   if (profile != ProfileManager::GetPrimaryUserProfile())
     return false;

chromeos/constants/chromeos_features.cc

@@ -433,10 +433,6 @@ const base::Feature kOsSettingsDeepLinking{"OsSettingsDeepLinking",
 const base::Feature kOsSettingsPolymer3{"OsSettingsPolymer3",
                                         base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Controls whether to enable the Parental Controls section of settings.
-const base::Feature kParentalControlsSettings{
-    "ChromeOSParentalControlsSettings", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Provides a UI for users to view information about their Android phone
 // and perform phone-side actions within Chrome OS.
 const base::Feature kPhoneHub{"PhoneHub", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -726,10 +722,6 @@ bool IsClipboardHistorySimpleRenderEnabled() {
   return base::FeatureList::IsEnabled(kClipboardHistorySimpleRender);
 }
 
-bool IsParentalControlsSettingsEnabled() {
-  return base::FeatureList::IsEnabled(kParentalControlsSettings);
-}
-
 bool IsPhoneHubEnabled() {
   return base::FeatureList::IsEnabled(kPhoneHub);
 }

chromeos/constants/chromeos_features.h

@@ -196,8 +196,6 @@ extern const base::Feature kOsSettingsDeepLinking;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kOsSettingsPolymer3;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
-extern const base::Feature kParentalControlsSettings;
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kPhoneHub;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kPhoneHubUseBle;
@@ -317,7 +315,6 @@ COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsClipboardHistoryEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 bool IsClipboardHistorySimpleRenderEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsOobeScreensPriorityEnabled();
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsParentalControlsSettingsEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsPhoneHubEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsPhoneHubUseBleEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsPinAutosubmitFeatureEnabled();