Remove feature flag and switch for frame-throttling.

Bug: 40258184
Change-Id: I4be3573acece3be55b8bb8986c3ac16580d828b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5309587
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Zoraiz Naeem <zoraiznaeem@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1263086}

ash/constants/ash_switches.cc

@@ -707,9 +707,6 @@ const char kForestFeatureKey[] = "forest-feature-key";
 // "CHROMEBIT", "CHROMEBOOK", "REFERENCE", "CHROMEBOX"
 const char kFormFactor[] = "form-factor";
 
-// Sets the throttle fps for compositor frame submission.
-const char kFrameThrottleFps[] = "frame-throttle-fps";
-
 // Switch name for "glanceables-v2-key" flag and its expected hashed value.
 const char kGlanceablesKeyExpectedHash[] =
     "\x52\xde\x04\xda\xef\x3a\xde\xe2\x90\x68\xa1\x5c\x36\xd5\x6b\x1d\xb8\x11"

ash/constants/ash_switches.h

@@ -230,7 +230,6 @@ COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kForceShowReleaseTrack[];
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kForceTabletPowerButton[];
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kForestFeatureKey[];
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kFormFactor[];
-COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kFrameThrottleFps[];
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kGlanceablesKeyExpectedHash[];
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kGlanceablesKeySwitch[];
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kGuestSession[];

ash/frame_throttler/frame_throttling_controller.cc

@@ -7,11 +7,9 @@
 #include <utility>
 
 #include "ash/constants/app_types.h"
-#include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/raw_ptr.h"
 #include "base/numerics/safe_conversions.h"
@@ -106,15 +104,7 @@ FrameThrottlingController::FrameThrottlingController(
     viz::HostFrameSinkManager* host_frame_sink_manager)
     : host_frame_sink_manager_(host_frame_sink_manager) {
   DCHECK(host_frame_sink_manager_);
-  int default_fps = kDefaultThrottleFps;
-  const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-  if (cl->HasSwitch(switches::kFrameThrottleFps)) {
-    if (!base::StringToInt(cl->GetSwitchValueASCII(switches::kFrameThrottleFps),
-                           &default_fps)) {
-      default_fps = kDefaultThrottleFps;
-    }
-  }
-  default_throttled_frame_interval_ = base::Hertz(default_fps);
+  default_throttled_frame_interval_ = base::Hertz(kDefaultThrottleFps);
   current_throttled_frame_interval_ = default_throttled_frame_interval_;
 }
 

chrome/browser/about_flags.cc

@@ -2774,23 +2774,6 @@ const FeatureEntry::Choice kEnableExperimentalCookieFeaturesChoices[] = {
      switches::kEnableExperimentalCookieFeatures, ""},
 };
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-const FeatureEntry::Choice kFrameThrottleFpsChoices[] = {
-    {flag_descriptions::kFrameThrottleFpsDefault, "", ""},
-    {flag_descriptions::kFrameThrottleFps5, ash::switches::kFrameThrottleFps,
-     "5"},
-    {flag_descriptions::kFrameThrottleFps10, ash::switches::kFrameThrottleFps,
-     "10"},
-    {flag_descriptions::kFrameThrottleFps15, ash::switches::kFrameThrottleFps,
-     "15"},
-    {flag_descriptions::kFrameThrottleFps20, ash::switches::kFrameThrottleFps,
-     "20"},
-    {flag_descriptions::kFrameThrottleFps25, ash::switches::kFrameThrottleFps,
-     "25"},
-    {flag_descriptions::kFrameThrottleFps30, ash::switches::kFrameThrottleFps,
-     "30"}};
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
-
 const FeatureEntry::FeatureParam kDrawPredictedPointExperiment1Point12Ms[] = {
     {"predicted_points", features::kDraw1Point12Ms}};
 const FeatureEntry::FeatureParam kDrawPredictedPointExperiment2Points6Ms[] = {
@@ -8371,12 +8354,6 @@ const FeatureEntry kFeatureEntries[] = {
          "LauncherDynamicAnimations")},
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-    {"frame-throttle-fps", flag_descriptions::kFrameThrottleFpsName,
-     flag_descriptions::kFrameThrottleFpsDescription, kOsCrOS,
-     MULTI_VALUE_TYPE(kFrameThrottleFpsChoices)},
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
-
 #if BUILDFLAG(IS_ANDROID)
     {"incognito-reauthentication-for-android",
      flag_descriptions::kIncognitoReauthenticationForAndroidName,

chrome/browser/flag-metadata.json

@@ -4544,11 +4544,6 @@
     "owners": [ "bokan@chromium.org" ],
     "expiry_milestone": 81
   },
-  {
-    "name": "frame-throttle-fps",
-    "owners":[ "yjliu@chromium.org", "chromeos-perf@google.com"],
-    "expiry_milestone": 95
-  },
   {
     "name": "fsps-in-recents",
     "owners": [ "simmonsjosh@google.com", "benhartney@google.com", "petermarshall@chromium.org", "majewski@chromium.org" ],

chrome/browser/flag_descriptions.cc

@@ -6620,17 +6620,6 @@ const char kForceReSyncDriveName[] = "Force resync drive";
 const char kForceReSyncDriveDescription[] =
     "Enable Drive to forcibly resync office files.";
 
-const char kFrameThrottleFpsName[] = "Set frame throttling fps.";
-const char kFrameThrottleFpsDescription[] =
-    "Set the throttle fps for compositor frame submission.";
-const char kFrameThrottleFpsDefault[] = "Default";
-const char kFrameThrottleFps5[] = "5 fps";
-const char kFrameThrottleFps10[] = "10 fps";
-const char kFrameThrottleFps15[] = "15 fps";
-const char kFrameThrottleFps20[] = "20 fps";
-const char kFrameThrottleFps25[] = "25 fps";
-const char kFrameThrottleFps30[] = "30 fps";
-
 const char kFSPsInRecentsName[] =
     "Enable chrome.fileSystemProviders in Recents";
 const char kFSPsInRecentsDescription[] =

chrome/browser/flag_descriptions.h

@@ -3810,16 +3810,6 @@ extern const char kFocusModeDescription[];
 extern const char kForceReSyncDriveName[];
 extern const char kForceReSyncDriveDescription[];
 
-extern const char kFrameThrottleFpsName[];
-extern const char kFrameThrottleFpsDescription[];
-extern const char kFrameThrottleFpsDefault[];
-extern const char kFrameThrottleFps5[];
-extern const char kFrameThrottleFps10[];
-extern const char kFrameThrottleFps15[];
-extern const char kFrameThrottleFps20[];
-extern const char kFrameThrottleFps25[];
-extern const char kFrameThrottleFps30[];
-
 extern const char kFSPsInRecentsName[];
 extern const char kFSPsInRecentsDescription[];