Remove deprecated Parent Access Code feature flags.

Bug: 1124111
Test: manual test
Change-Id: I63646022f816c26ea001797c3bccfefa0c8f1b77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380437
Commit-Queue: Li Lin <llin@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806232}

chrome/browser/chromeos/child_accounts/event_based_status_reporting_service_unittest.cc

@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/child_accounts/child_status_reporting_service.h"
 #include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
@@ -18,7 +17,6 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/power/fake_power_manager_client.h"
 #include "chromeos/dbus/system_clock/system_clock_client.h"
@@ -92,10 +90,6 @@ class EventBasedStatusReportingServiceTest : public testing::Test {
     PowerManagerClient::InitializeFake();
     SystemClockClient::InitializeFake();
 
-    // TODO(agawronska): To enable this we need LoginScreenClient, but it causes
-    // test crashes on network connection change.
-    scoped_feature_list_.InitAndDisableFeature(features::kParentAccessCode);
-
     profile_ = std::make_unique<TestingProfile>();
     profile_.get()->SetSupervisedUserId(supervised_users::kChildAccountSUID);
     arc_test_.SetUp(profile());
@@ -176,7 +170,6 @@ class EventBasedStatusReportingServiceTest : public testing::Test {
       test_consumer_status_reporting_service_;
   TestingScreenTimeController* test_screen_time_controller_;
   session_manager::SessionManager session_manager_;
-  base::test::ScopedFeatureList scoped_feature_list_;
   std::unique_ptr<EventBasedStatusReportingService> service_;
 
   DISALLOW_COPY_AND_ASSIGN(EventBasedStatusReportingServiceTest);

chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.cc

@@ -54,10 +54,6 @@ bool ParentAccessService::IsApprovalRequired(SupervisedAction action) {
   switch (action) {
     case SupervisedAction::kUpdateClock:
     case SupervisedAction::kUpdateTimezone:
-      if (!base::FeatureList::IsEnabled(
-              features::kParentAccessCodeForTimeChange)) {
-        return false;
-      }
       if (user_manager::UserManager::Get()->IsUserLoggedIn())
         return user_manager::UserManager::Get()->GetActiveUser()->IsChild();
       return IsDeviceOwnedByChild();

chrome/browser/chromeos/child_accounts/screen_time_controller.cc

@@ -90,13 +90,11 @@ ScreenTimeController::ScreenTimeController(content::BrowserContext* context)
       base::BindRepeating(&ScreenTimeController::OnPolicyChanged,
                           base::Unretained(this)));
 
-  if (base::FeatureList::IsEnabled(features::kParentAccessCode))
-    parent_access::ParentAccessService::Get().AddObserver(this);
+  parent_access::ParentAccessService::Get().AddObserver(this);
 }
 
 ScreenTimeController::~ScreenTimeController() {
-  if (base::FeatureList::IsEnabled(features::kParentAccessCode))
-    parent_access::ParentAccessService::Get().RemoveObserver(this);
+  parent_access::ParentAccessService::Get().RemoveObserver(this);
 
   session_manager::SessionManager::Get()->RemoveObserver(this);
   UsageTimeStateNotifier::GetInstance()->RemoveObserver(this);
@@ -283,10 +281,8 @@ void ScreenTimeController::OnScreenLockByPolicy(
                             true /*disable_lock_screen_media*/));
 
   // Add parent access code button.
-  // TODO(agawronska): Once feature flag is removed, showing shelf button could
-  // be moved to ash.
-  if (base::FeatureList::IsEnabled(features::kParentAccessCode))
-    ash::LoginScreen::Get()->ShowParentAccessButton(true);
+  // TODO(agawronska): Move showing shelf button to ash.
+  ash::LoginScreen::Get()->ShowParentAccessButton(true);
 }
 
 void ScreenTimeController::OnScreenLockByPolicyEnd() {
@@ -299,10 +295,8 @@ void ScreenTimeController::OnScreenLockByPolicyEnd() {
           ->GetAccountId();
   ScreenLocker::default_screen_locker()->EnableAuthForUser(account_id);
 
-  // TODO(agawronska): Once feature flag is removed, showing shelf button could
-  // be moved to ash.
-  if (base::FeatureList::IsEnabled(features::kParentAccessCode))
-    ash::LoginScreen::Get()->ShowParentAccessButton(false);
+  // TODO(agawronska): Move showing shelf button to ash.
+  ash::LoginScreen::Get()->ShowParentAccessButton(false);
 }
 
 void ScreenTimeController::OnPolicyChanged() {

chrome/browser/chromeos/system/timezone_util.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/timezone_resolver_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/constants/chromeos_switches.h"
@@ -176,15 +175,12 @@ bool CanSetSystemTimezone(const user_manager::User* user) {
     case user_manager::USER_TYPE_ARC_KIOSK_APP:
     case user_manager::USER_TYPE_ACTIVE_DIRECTORY:
     case user_manager::USER_TYPE_WEB_KIOSK_APP:
+    case user_manager::USER_TYPE_CHILD:
       return true;
 
     case user_manager::USER_TYPE_GUEST:
       return false;
 
-    case user_manager::USER_TYPE_CHILD:
-      return base::FeatureList::IsEnabled(
-          features::kParentAccessCodeForTimeChange);
-
     case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
       return CanSetSystemTimezoneFromManagedGuestSession();
 

chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.h"
 
-#include "base/feature_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/system/timezone_resolver_manager.h"
@@ -12,7 +11,6 @@
 #include "chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/extensions/api/settings_private.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
@@ -77,13 +75,6 @@ SetPrefResult GeneratedResolveTimezoneByGeolocationOnOff::SetPref(
     return SetPrefResult::PREF_NOT_MODIFIABLE;
   }
 
-  // If the Parent Access Code feature is not available, children must use
-  // automatic timezone.
-  if (profile_->IsChild() &&
-      !base::FeatureList::IsEnabled(features::kParentAccessCodeForTimeChange)) {
-    return SetPrefResult::PREF_NOT_MODIFIABLE;
-  }
-
   const bool new_value = value->GetBool();
   const bool current_value = g_browser_process->platform_part()
                                  ->GetTimezoneResolverManager()

chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.cc

@@ -4,12 +4,10 @@
 
 #include "chrome/browser/extensions/api/settings_private/generated_time_zone_pref_base.h"
 
-#include "base/feature_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/system/timezone_resolver_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/extensions/api/settings_private.h"
 #include "components/user_manager/user_manager.h"
 
@@ -45,12 +43,7 @@ void GeneratedTimeZonePrefBase::UpdateTimeZonePrefControlledBy(
     out_pref->enforcement = settings_api::ENFORCEMENT_ENFORCED;
   } else if (profile_->IsChild()) {
     out_pref->controlled_by = settings_api::CONTROLLED_BY_PARENT;
-    if (base::FeatureList::IsEnabled(
-            features::kParentAccessCodeForTimeChange)) {
-      out_pref->enforcement = settings_api::ENFORCEMENT_PARENT_SUPERVISED;
-    } else {
-      out_pref->enforcement = settings_api::ENFORCEMENT_ENFORCED;
-    }
+    out_pref->enforcement = settings_api::ENFORCEMENT_PARENT_SUPERVISED;
   } else if (!profile_->IsSameOrParent(
                  ProfileManager::GetPrimaryUserProfile())) {
     out_pref->controlled_by = settings_api::CONTROLLED_BY_PRIMARY_USER;

chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.js

@@ -69,8 +69,7 @@ Polymer({
      */
     displayManagedByParentIcon_: {
       type: Boolean,
-      value: loadTimeData.getBoolean('isChild') &&
-          loadTimeData.getBoolean('timeActionsProtectedForChild')
+      value: loadTimeData.getBoolean('isChild'),
     },
 
     /**

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

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/settings/chromeos/date_time_section.h"
 
-#include "base/feature_list.h"
 #include "base/no_destructor.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -13,7 +12,6 @@
 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
 #include "chrome/browser/ui/webui/settings/chromeos/search/search_tag_registry.h"
 #include "chrome/browser/ui/webui/webui_util.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/settings/cros_settings_names.h"
@@ -130,9 +128,6 @@ void DateTimeSection::AddLoadTimeData(content::WebUIDataSource* html_source) {
   html_source->AddString(
       "timeZoneID",
       system::TimezoneSettings::GetInstance()->GetCurrentTimezoneID());
-  html_source->AddBoolean(
-      "timeActionsProtectedForChild",
-      base::FeatureList::IsEnabled(features::kParentAccessCodeForTimeChange));
 
   bool is_child = user_manager::UserManager::Get()->GetActiveUser()->IsChild();
   html_source->AddBoolean("isChild", is_child);

chrome/common/chrome_features.cc

@@ -572,21 +572,11 @@ const base::Feature kOomIntervention{"OomIntervention",
 #endif
 
 #if defined(OS_CHROMEOS)
-// Enables usage of Parent Access Code to authorize certain actions on child
-// user device.
-const base::Feature kParentAccessCode{"ParentAccessCode",
-                                      base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enables usage of Parent Access Code in the login flow for reauth and add
 // user. Requires |kParentAccessCode| to be enabled.
 const base::Feature kParentAccessCodeForOnlineLogin{
     "ParentAccessCodeForOnlineLogin", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables usage of Parent Access Code to authorize change of time actions on
-// child user device. Requires |kParentAccessCode| to be enabled.
-const base::Feature kParentAccessCodeForTimeChange{
-    "ParentAccessCodeForTimeChange", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enables enforcement of per-app time limits for child user.
 const base::Feature kPerAppTimeLimits{"PerAppTimeLimits",
                                       base::FEATURE_ENABLED_BY_DEFAULT};
@@ -838,8 +828,7 @@ const base::Feature kWriteBasicSystemProfileToPersistentHistogramsFile{
 
 #if defined(OS_CHROMEOS)
 bool IsParentAccessCodeForOnlineLoginEnabled() {
-  return base::FeatureList::IsEnabled(kParentAccessCode) &&
-         base::FeatureList::IsEnabled(kParentAccessCodeForOnlineLogin);
+  return base::FeatureList::IsEnabled(kParentAccessCodeForOnlineLogin);
 }
 #endif  // defined(OS_CHROMEOS)
 

chrome/common/chrome_features.h

@@ -373,15 +373,9 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kOomIntervention;
 #endif
 
 #if defined(OS_CHROMEOS)
-COMPONENT_EXPORT(CHROME_FEATURES)
-extern const base::Feature kParentAccessCode;
-
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kParentAccessCodeForOnlineLogin;
 
-COMPONENT_EXPORT(CHROME_FEATURES)
-extern const base::Feature kParentAccessCodeForTimeChange;
-
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kPerAppTimeLimits;