flags: remove enumerate-audio-devices

This flag has been default-enabled since M59.

Bug: 554168
Change-Id: I28ccc0ee77e2778c03cba16bda410906c29eb084
Reviewed-on: https://chromium-review.googlesource.com/c/1467723
Reviewed-by: Max Morin <maxmorin@chromium.org>
Commit-Queue: Max Morin <maxmorin@chromium.org>
Auto-Submit: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#631610}

chrome/browser/about_flags.cc

@@ -2740,12 +2740,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kExpensiveBackgroundTimerThrottlingName,
      flag_descriptions::kExpensiveBackgroundTimerThrottlingDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)},
-#if defined(OS_CHROMEOS)
-    {"enumerate-audio-devices",
-     flag_descriptions::kEnableEnumeratingAudioDevicesName,
-     flag_descriptions::kEnableEnumeratingAudioDevicesDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)},
-#endif  // OS_CHROMEOS
 #if defined(OS_ANDROID)
     {"modal-permission-prompts", flag_descriptions::kModalPermissionPromptsName,
      flag_descriptions::kModalPermissionPromptsDescription, kOsAndroid,

chrome/browser/flag-metadata.json

@@ -2101,11 +2101,6 @@
     "owners": [ "davidben", "svaldez" ],
     "expiry_milestone": 76
   },
-  {
-    "name": "enumerate-audio-devices",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "expensive-background-timer-throttling",
     // "owners": [ "your-team" ],

chrome/browser/flag_descriptions.cc

@@ -603,11 +603,6 @@ const char kEnforceTLS13DowngradeDescription[] =
     "this is enabled do not implement TLS 1.0 through 1.2 correctly or "
     "securely. They must be fixed by vendors.";
 
-const char kEnableEnumeratingAudioDevicesName[] =
-    "Experimentally enable enumerating audio devices.";
-const char kEnableEnumeratingAudioDevicesDescription[] =
-    "Experimentally enable the use of enumerating audio devices.";
-
 const char kEnableGenericSensorName[] = "Generic Sensor";
 const char kEnableGenericSensorDescription[] =
     "Enables motion sensor classes based on Generic Sensor API, i.e. "

chrome/browser/flag_descriptions.h

@@ -391,9 +391,6 @@ extern const char kEnableSystemWebAppsDescription[];
 extern const char kEnforceTLS13DowngradeName[];
 extern const char kEnforceTLS13DowngradeDescription[];
 
-extern const char kEnableEnumeratingAudioDevicesName[];
-extern const char kEnableEnumeratingAudioDevicesDescription[];
-
 extern const char kEnableGenericSensorName[];
 extern const char kEnableGenericSensorDescription[];
 

media/audio/audio_features.cc

@@ -12,10 +12,6 @@ const base::Feature kDumpOnAudioServiceHang{"DumpOnAudioServiceHang",
                                             base::FEATURE_DISABLED_BY_DEFAULT};
 
 #if defined(OS_CHROMEOS)
-// Allows experimentally enables mediaDevices.enumerateDevices() on ChromeOS.
-// Default disabled (crbug.com/554168).
-const base::Feature kEnumerateAudioDevices{"EnumerateAudioDevices",
-                                           base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kCrOSSystemAEC{"CrOSSystemAEC",
                                    base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kCrOSSystemAECDeactivatedGroups{

media/audio/audio_features.h

@@ -14,7 +14,6 @@ namespace features {
 MEDIA_EXPORT extern const base::Feature kDumpOnAudioServiceHang;
 
 #if defined(OS_CHROMEOS)
-MEDIA_EXPORT extern const base::Feature kEnumerateAudioDevices;
 MEDIA_EXPORT extern const base::Feature kCrOSSystemAEC;
 MEDIA_EXPORT extern const base::Feature kCrOSSystemAECDeactivatedGroups;
 #endif

media/audio/cras/audio_manager_cras.cc

@@ -133,29 +133,27 @@ void AudioManagerCras::GetAudioDeviceNamesImpl(bool is_input,
 
   device_names->push_back(AudioDeviceName::CreateDefault());
 
-  if (base::FeatureList::IsEnabled(features::kEnumerateAudioDevices)) {
-    chromeos::AudioDeviceList devices;
-    GetAudioDevices(&devices);
+  chromeos::AudioDeviceList devices;
+  GetAudioDevices(&devices);
 
-    // |dev_idx_map| is a map of dev_index and their audio devices.
-    std::map<int, chromeos::AudioDeviceList> dev_idx_map;
-    for (const auto& device : devices) {
-      if (device.is_input != is_input || !device.is_for_simple_usage())
-        continue;
+  // |dev_idx_map| is a map of dev_index and their audio devices.
+  std::map<int, chromeos::AudioDeviceList> dev_idx_map;
+  for (const auto& device : devices) {
+    if (device.is_input != is_input || !device.is_for_simple_usage())
+      continue;
 
-      dev_idx_map[dev_index_of(device.id)].push_back(device);
-    }
+    dev_idx_map[dev_index_of(device.id)].push_back(device);
+  }
 
-    for (const auto& item : dev_idx_map) {
-      if (1 == item.second.size()) {
-        const chromeos::AudioDevice& device = item.second.front();
-        device_names->emplace_back(device.display_name,
-                                   base::NumberToString(device.id));
-      } else {
-        // Create virtual device name for audio nodes that share the same device
-        // index.
-        ProcessVirtualDeviceName(device_names, item.second);
-      }
+  for (const auto& item : dev_idx_map) {
+    if (1 == item.second.size()) {
+      const chromeos::AudioDevice& device = item.second.front();
+      device_names->emplace_back(device.display_name,
+                                 base::NumberToString(device.id));
+    } else {
+      // Create virtual device name for audio nodes that share the same device
+      // index.
+      ProcessVirtualDeviceName(device_names, item.second);
     }
   }
 }
@@ -216,9 +214,6 @@ AudioParameters AudioManagerCras::GetInputStreamParameters(
 
 std::string AudioManagerCras::GetAssociatedOutputDeviceID(
     const std::string& input_device_id) {
-  if (!base::FeatureList::IsEnabled(features::kEnumerateAudioDevices))
-    return "";
-
   chromeos::AudioDeviceList devices;
   GetAudioDevices(&devices);