Clean up the GamepadPollingInterval feature.

Bug: 1126640
Change-Id: I2756db28b9f5e78d580c7de94263b651d842d900
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435719Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Matt Reynolds <mattreynolds@chromium.org>
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Cr-Commit-Position: refs/heads/master@{#811642}

device/gamepad/gamepad_provider.cc

@@ -29,6 +29,8 @@
 
 namespace device {
 
+constexpr int64_t kPollingIntervalMilliseconds = 4;  // ~250 Hz
+
 GamepadProvider::GamepadProvider(
     GamepadConnectionChangeClient* connection_change_client)
     : gamepad_shared_buffer_(std::make_unique<GamepadSharedBuffer>()),
@@ -139,7 +141,7 @@ void GamepadProvider::OnDevicesChanged(base::SystemMonitor::DeviceType type) {
 
 void GamepadProvider::Initialize(std::unique_ptr<GamepadDataFetcher> fetcher) {
   sampling_interval_delta_ =
-      base::TimeDelta::FromMilliseconds(features::GetGamepadPollingInterval());
+      base::TimeDelta::FromMilliseconds(kPollingIntervalMilliseconds);
 
   base::SystemMonitor* monitor = base::SystemMonitor::Get();
   if (monitor)

device/gamepad/public/cpp/gamepad_features.cc

@@ -15,24 +15,6 @@
 
 namespace features {
 
-namespace {
-
-const size_t kPollingIntervalMillisecondsMin = 4;   // ~250 Hz
-const size_t kPollingIntervalMillisecondsMax = 16;  // ~62.5 Hz
-
-size_t OverrideIntervalIfValid(base::StringPiece param_value,
-                               size_t default_interval) {
-  size_t interval;
-  if (param_value.empty() || !base::StringToSizeT(param_value, &interval))
-    return default_interval;
-  // Clamp interval duration to valid range.
-  interval = std::max(interval, kPollingIntervalMillisecondsMin);
-  interval = std::min(interval, kPollingIntervalMillisecondsMax);
-  return interval;
-}
-
-}  // namespace
-
 // Enables gamepadbuttondown, gamepadbuttonup, gamepadbuttonchange,
 // gamepadaxismove non-standard gamepad events.
 const base::Feature kEnableGamepadButtonAxisEvents{
@@ -42,15 +24,9 @@ const base::Feature kEnableGamepadButtonAxisEvents{
 const base::Feature kEnableWindowsGamingInputDataFetcher{
     "EnableWindowsGamingInputDataFetcher", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Overrides the gamepad polling interval.
-const base::Feature kGamepadPollingInterval{"GamepadPollingInterval",
-                                            base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kRestrictGamepadAccess{"RestrictGamepadAccess",
                                            base::FEATURE_DISABLED_BY_DEFAULT};
 
-const char kGamepadPollingIntervalParamKey[] = "interval-ms";
-
 bool AreGamepadButtonAxisEventsEnabled() {
   // Check if button and axis events are enabled by a field trial.
   if (base::FeatureList::IsEnabled(kEnableGamepadButtonAxisEvents))
@@ -66,27 +42,4 @@ bool AreGamepadButtonAxisEventsEnabled() {
   return false;
 }
 
-size_t GetGamepadPollingInterval() {
-  // Default to the minimum polling interval.
-  size_t polling_interval = kPollingIntervalMillisecondsMin;
-
-  // Check if the polling interval is overridden by a field trial.
-  if (base::FeatureList::IsEnabled(kGamepadPollingInterval)) {
-    std::string param_value = base::GetFieldTrialParamValueByFeature(
-        kGamepadPollingInterval, kGamepadPollingIntervalParamKey);
-    polling_interval = OverrideIntervalIfValid(param_value, polling_interval);
-  }
-
-  // Check if the polling interval is overridden by a command-line flag.
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line &&
-      command_line->HasSwitch(switches::kGamepadPollingInterval)) {
-    std::string switch_value =
-        command_line->GetSwitchValueASCII(switches::kGamepadPollingInterval);
-    polling_interval = OverrideIntervalIfValid(switch_value, polling_interval);
-  }
-
-  return polling_interval;
-}
-
 }  // namespace features

device/gamepad/public/cpp/gamepad_features.h

@@ -14,12 +14,9 @@ GAMEPAD_FEATURES_EXPORT extern const base::Feature
     kEnableGamepadButtonAxisEvents;
 GAMEPAD_FEATURES_EXPORT extern const base::Feature
     kEnableWindowsGamingInputDataFetcher;
-GAMEPAD_FEATURES_EXPORT extern const base::Feature kGamepadPollingInterval;
 GAMEPAD_FEATURES_EXPORT extern const base::Feature kRestrictGamepadAccess;
-GAMEPAD_FEATURES_EXPORT extern const char kGamepadPollingIntervalParamKey[];
 
 GAMEPAD_FEATURES_EXPORT bool AreGamepadButtonAxisEventsEnabled();
-GAMEPAD_FEATURES_EXPORT size_t GetGamepadPollingInterval();
 
 }  // namespace features
 

testing/variations/fieldtrial_testing_config.json

@@ -2959,30 +2959,6 @@
             ]
         }
     ],
-    "GamepadPollingInterval": [
-        {
-            "platforms": [
-                "windows",
-                "mac",
-                "chromeos",
-                "linux",
-                "android",
-                "android_weblayer",
-                "android_webview"
-            ],
-            "experiments": [
-                {
-                    "name": "EnabledGamepadPolling250Hz",
-                    "params": {
-                        "interval-ms": "4"
-                    },
-                    "enable_features": [
-                        "GamepadPollingInterval"
-                    ]
-                }
-            ]
-        }
-    ],
     "GestureNavigation": [
         {
             "platforms": [