Clean up TimeOfDay experiment flags.
It was launched back in M117. Note that in this case, the
kFeatureManagementTimeOfDay flags are still needed as not all devices
will get this feature by design.
Bug: b:320545501
Change-Id: I62018a5a9e12d35d13d08b1bd50aabd16962fd22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5201561
Commit-Queue: Eric Sum <esum@google.com>
Reviewed-by: Thuong Phan <thuongphan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1248293}
diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
index d904d433..a8c5e18 100644
--- a/ash/constants/ash_features.cc
+++ b/ash/constants/ash_features.cc
@@ -2702,16 +2702,6 @@
"TilingWindowResize",
base::FEATURE_DISABLED_BY_DEFAULT);
-// Enables time of day screen saver.
-BASE_FEATURE(kTimeOfDayScreenSaver,
- "TimeOfDayScreenSaver",
- base::FEATURE_ENABLED_BY_DEFAULT);
-
-// Enables time of day wallpaper.
-BASE_FEATURE(kTimeOfDayWallpaper,
- "TimeOfDayWallpaper",
- base::FEATURE_ENABLED_BY_DEFAULT);
-
// Forces the time of day wallpaper to change on an automatic sunset-to-sunrise
// schedule, regardless of what dark/light mode settings are active.
// Not used if time of day wallpaper is not enabled.
@@ -4360,14 +4350,12 @@
}
bool IsTimeOfDayScreenSaverEnabled() {
- return base::FeatureList::IsEnabled(kTimeOfDayScreenSaver) &&
- base::FeatureList::IsEnabled(kFeatureManagementTimeOfDayScreenSaver) &&
+ return base::FeatureList::IsEnabled(kFeatureManagementTimeOfDayScreenSaver) &&
IsTimeOfDayWallpaperEnabled();
}
bool IsTimeOfDayWallpaperEnabled() {
- return base::FeatureList::IsEnabled(kTimeOfDayWallpaper) &&
- base::FeatureList::IsEnabled(kFeatureManagementTimeOfDayWallpaper);
+ return base::FeatureList::IsEnabled(kFeatureManagementTimeOfDayWallpaper);
}
bool IsTimeOfDayWallpaperForcedAutoScheduleEnabled() {
diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
index 5fa1a1a1..b27f0cb 100644
--- a/ash/constants/ash_features.h
+++ b/ash/constants/ash_features.h
@@ -839,8 +839,6 @@
BASE_DECLARE_FEATURE(kTerminalAlternativeEmulator);
COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kTerminalDev);
COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kTilingWindowResize);
-COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kTimeOfDayScreenSaver);
-COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kTimeOfDayWallpaper);
COMPONENT_EXPORT(ASH_CONSTANTS)
BASE_DECLARE_FEATURE(kTimeOfDayWallpaperForcedAutoSchedule);
COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kTimeOfDayDlc);
diff --git a/ash/public/cpp/personalization_app/time_of_day_test_utils.cc b/ash/public/cpp/personalization_app/time_of_day_test_utils.cc
index 5dc3f954..4bed7a3b 100644
--- a/ash/public/cpp/personalization_app/time_of_day_test_utils.cc
+++ b/ash/public/cpp/personalization_app/time_of_day_test_utils.cc
@@ -12,8 +12,7 @@
namespace {
std::vector<base::test::FeatureRef> GetTimeOfDayFeatures() {
- return {features::kTimeOfDayWallpaper, features::kTimeOfDayScreenSaver,
- features::kFeatureManagementTimeOfDayWallpaper,
+ return {features::kFeatureManagementTimeOfDayWallpaper,
features::kFeatureManagementTimeOfDayScreenSaver};
}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0b2b389..9e1555fb 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2979,10 +2979,8 @@
constexpr char kWallpaperGooglePhotosSharedAlbumsInternalName[] =
"wallpaper-google-photos-shared-albums";
constexpr char kWallpaperPerDeskName[] = "per-desk-wallpaper";
-constexpr char kTimeOfDayWallpaperInternalName[] = "time-of-day-wallpaper";
constexpr char kTimeOfDayWallpaperForcedAutoScheduleInternalName[] =
"time-of-day-wallpaper-forced-auto-schedule";
-constexpr char kTimeOfDayScreenSaverInternalName[] = "time-of-day-screen-saver";
constexpr char kTimeOfDayDlcInternalName[] = "time-of-day-dlc";
constexpr char kGlanceablesV2InternalName[] = "glanceables-v2";
constexpr char kGlanceablesV2KeyName[] = "glanceables-v2-key";
@@ -4380,14 +4378,6 @@
kOsCrOS,
FEATURE_VALUE_TYPE(
ash::features::kPolicyProvidedTrustAnchorsAllowedAtLockScreen)},
- {kTimeOfDayScreenSaverInternalName,
- flag_descriptions::kTimeOfDayScreenSaverName,
- flag_descriptions::kTimeOfDayScreenSaverDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kTimeOfDayScreenSaver)},
- {kTimeOfDayWallpaperInternalName,
- flag_descriptions::kTimeOfDayWallpaperName,
- flag_descriptions::kTimeOfDayWallpaperDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kTimeOfDayWallpaper)},
{kTimeOfDayWallpaperForcedAutoScheduleInternalName,
flag_descriptions::kTimeOfDayWallpaperForcedAutoScheduleName,
flag_descriptions::kTimeOfDayWallpaperForcedAutoScheduleDescription,
@@ -11331,22 +11321,6 @@
base::FeatureList::OVERRIDE_DISABLE_FEATURE);
}
- // Only show Time of Day wallpaper flag if channel is one of
- // Dev/Canary/Unknown.
- if (!strcmp(kTimeOfDayWallpaperInternalName, entry.internal_name)) {
- return (channel != version_info::Channel::DEV &&
- channel != version_info::Channel::CANARY &&
- channel != version_info::Channel::UNKNOWN);
- }
-
- // Only show Time of Day Screen Saver flag if channel is one of
- // Dev/Canary/Unknown.
- if (!strcmp(kTimeOfDayScreenSaverInternalName, entry.internal_name)) {
- return (channel != version_info::Channel::DEV &&
- channel != version_info::Channel::CANARY &&
- channel != version_info::Channel::UNKNOWN);
- }
-
// Only show glanceables flag if channel is one of Beta/Dev/Canary/Unknown.
if (!strcmp(kGlanceablesV2InternalName, entry.internal_name)) {
return channel != version_info::Channel::BETA &&
diff --git a/chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_mocha_test_base.cc b/chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_mocha_test_base.cc
index dbb3531..90824897 100644
--- a/chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_mocha_test_base.cc
+++ b/chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_mocha_test_base.cc
@@ -27,8 +27,6 @@
{
::ash::features::kFeatureManagementTimeOfDayScreenSaver,
::ash::features::kFeatureManagementTimeOfDayWallpaper,
- ::ash::features::kTimeOfDayScreenSaver,
- ::ash::features::kTimeOfDayWallpaper,
},
{});
set_test_loader_host(
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 3410c88..8a7c824e 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -7933,16 +7933,6 @@
"expiry_milestone": 123
},
{
- "name": "time-of-day-screen-saver",
- "owners": [ "esum@chromium.org", "jasontt@chromium.org", "assistive-eng@google.com" ],
- "expiry_milestone": 120
- },
- {
- "name": "time-of-day-wallpaper",
- "owners": [ "esum@chromium.org", "jasontt@chromium.org", "assistive-eng@google.com" ],
- "expiry_milestone": 120
- },
- {
"name": "time-of-day-wallpaper-forced-auto-schedule",
"owners": [ "esum@chromium.org", "jasontt@chromium.org", "assistive-eng@google.com" ],
"expiry_milestone": 124
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index d680019..4ee8cef6 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -7104,15 +7104,6 @@
"Enables Instant Tethering. Instant Tethering allows your nearby Google "
"phone to share its Internet connection with this device.";
-const char kTimeOfDayScreenSaverName[] = "Time of Day Screen Saver";
-const char kTimeOfDayScreenSaverDescription[] =
- "Enables Time of Day Screen Saver feature on supported devices. Requires "
- "Time Of Day Wallpaper feature to be enabled.";
-
-const char kTimeOfDayWallpaperName[] = "Time of Day Wallpaper";
-const char kTimeOfDayWallpaperDescription[] =
- "Enables Time of Day Wallpaper feature on supported devices.";
-
const char kTimeOfDayWallpaperForcedAutoScheduleName[] =
"Time of Day Wallpaper Forced Auto Schedule";
const char kTimeOfDayWallpaperForcedAutoScheduleDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 64a38ece..46dd869 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -4085,12 +4085,6 @@
extern const char kTetherName[];
extern const char kTetherDescription[];
-extern const char kTimeOfDayScreenSaverName[];
-extern const char kTimeOfDayScreenSaverDescription[];
-
-extern const char kTimeOfDayWallpaperName[];
-extern const char kTimeOfDayWallpaperDescription[];
-
extern const char kTimeOfDayWallpaperForcedAutoScheduleName[];
extern const char kTimeOfDayWallpaperForcedAutoScheduleDescription[];
