Change std::find() to use base:: functions: media/

Simplifies code slightly.

Bug: 1368812
Change-Id: Ied2062622a89b3271b9343a3ab857aaf01cb50e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3927809
Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1053159}

media/audio/mac/audio_manager_mac.cc

@@ -4,7 +4,6 @@
 
 #include "media/audio/mac/audio_manager_mac.h"
 
-#include <algorithm>
 #include <limits>
 #include <memory>
 #include <utility>
@@ -19,6 +18,7 @@
 #include "base/memory/free_deleter.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_observer.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
@@ -1229,9 +1229,7 @@ void AudioManagerMac::ReleaseOutputStreamUsingRealDevice(
 
 void AudioManagerMac::ReleaseInputStream(AudioInputStream* stream) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
-  auto stream_it = std::find(basic_input_streams_.begin(),
-                             basic_input_streams_.end(),
-                             stream);
+  auto stream_it = base::ranges::find(basic_input_streams_, stream);
   if (stream_it == basic_input_streams_.end())
     low_latency_input_streams_.remove(static_cast<AUAudioInputStream*>(stream));
   else

media/base/android/media_codec_util.cc

@@ -6,13 +6,13 @@
 
 #include <stddef.h>
 
-#include <algorithm>
 #include <vector>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/containers/contains.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
@@ -68,8 +68,7 @@ static bool IsSupportedAndroidMimeType(const std::string& mime_type) {
       kMp3MimeType, kAacMimeType,         kOpusMimeType, kVorbisMimeType,
       kAvcMimeType, kDolbyVisionMimeType, kHevcMimeType, kVp8MimeType,
       kVp9MimeType, kAv1MimeType};
-  return std::find(supported.begin(), supported.end(), mime_type) !=
-         supported.end();
+  return base::Contains(supported, mime_type);
 }
 
 static bool IsDecoderSupportedByDevice(const std::string& android_mime_type) {

media/base/audio_converter.cc

@@ -10,11 +10,11 @@
 
 #include "media/base/audio_converter.h"
 
-#include <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
+#include "base/containers/contains.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/audio_bus.h"
@@ -88,14 +88,12 @@ AudioConverter::AudioConverter(const AudioParameters& input_params,
 AudioConverter::~AudioConverter() = default;
 
 void AudioConverter::AddInput(InputCallback* input) {
-  DCHECK(std::find(transform_inputs_.begin(), transform_inputs_.end(), input) ==
-         transform_inputs_.end());
+  DCHECK(!base::Contains(transform_inputs_, input));
   transform_inputs_.push_back(input);
 }
 
 void AudioConverter::RemoveInput(InputCallback* input) {
-  DCHECK(std::find(transform_inputs_.begin(), transform_inputs_.end(), input) !=
-         transform_inputs_.end());
+  DCHECK(base::Contains(transform_inputs_, input));
   transform_inputs_.remove(input);
 
   if (transform_inputs_.empty())

media/base/channel_mixing_matrix.cc

@@ -6,9 +6,9 @@
 
 #include <stddef.h>
 
-#include <algorithm>
-
 #include "base/check_op.h"
+#include "base/containers/contains.h"
+#include "base/ranges/algorithm.h"
 #include "media/base/channel_mixer.h"
 
 namespace media {
@@ -260,13 +260,11 @@ bool ChannelMixingMatrix::CreateTransformationMatrix(
 }
 
 void ChannelMixingMatrix::AccountFor(Channels ch) {
-  unaccounted_inputs_.erase(std::find(
-      unaccounted_inputs_.begin(), unaccounted_inputs_.end(), ch));
+  unaccounted_inputs_.erase(base::ranges::find(unaccounted_inputs_, ch));
 }
 
 bool ChannelMixingMatrix::IsUnaccounted(Channels ch) const {
-  return std::find(unaccounted_inputs_.begin(), unaccounted_inputs_.end(),
-                   ch) != unaccounted_inputs_.end();
+  return base::Contains(unaccounted_inputs_, ch);
 }
 
 bool ChannelMixingMatrix::HasInputChannel(Channels ch) const {

media/capture/video/chromeos/camera_3a_controller.cc

@@ -108,11 +108,10 @@ Camera3AController::Camera3AController(
     if (available_modes.empty()) {
       return false;
     }
-    if (std::find(
-            available_modes.begin(), available_modes.end(),
+    if (!base::Contains(
+            available_modes,
             base::checked_cast<uint8_t>(
-                cros::mojom::AndroidControlMode::ANDROID_CONTROL_MODE_AUTO)) ==
-        available_modes.end()) {
+                cros::mojom::AndroidControlMode::ANDROID_CONTROL_MODE_AUTO))) {
       return false;
     }
     if (!available_ae_modes_.count(

media/capture/video/chromeos/token_manager.cc

@@ -7,8 +7,10 @@
 #include <grp.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <string>
 
+#include "base/containers/contains.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
@@ -99,8 +101,7 @@ bool TokenManager::GenerateTestClientToken() {
 base::UnguessableToken TokenManager::GetTokenForTrustedClient(
     cros::mojom::CameraClientType type) {
   base::AutoLock l(client_token_map_lock_);
-  if (std::find(kTrustedClientTypes.begin(), kTrustedClientTypes.end(), type) ==
-      kTrustedClientTypes.end()) {
+  if (!base::Contains(kTrustedClientTypes, type)) {
     return base::UnguessableToken();
   }
   auto& token_set = client_token_map_[type];

media/capture/video/linux/v4l2_capture_delegate.cc

@@ -11,6 +11,7 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
+#include <algorithm>
 #include <utility>
 
 #include "base/bind.h"

media/capture/video/video_capture_device.cc

@@ -6,6 +6,7 @@
 
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/containers/contains.h"
 #include "base/i18n/timezone.h"
 #include "base/strings/string_util.h"
 #include "base/token.h"
@@ -88,10 +89,7 @@ PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequencyForLocation() {
       "CR", "CU", "DO", "EC", "FM", "GT", "GU", "GY", "HN", "HT", "JP",
       "KN", "KR", "KY", "MS", "MX", "NI", "PA", "PE", "PF", "PH", "PR",
       "PW", "SA", "SR", "SV", "TT", "TW", "UM", "US", "VG", "VI", "VE"};
-  const char** countries_using_60Hz_end =
-      countries_using_60Hz + std::size(countries_using_60Hz);
-  if (std::find(countries_using_60Hz, countries_using_60Hz_end,
-                current_country) == countries_using_60Hz_end) {
+  if (!base::Contains(countries_using_60Hz, current_country)) {
     return PowerLineFrequency::FREQUENCY_50HZ;
   }
   return PowerLineFrequency::FREQUENCY_60HZ;

media/capture/video/video_capture_device_client.cc

@@ -4,14 +4,14 @@
 
 #include "media/capture/video/video_capture_device_client.h"
 
-#include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/contains.h"
 #include "base/location.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ -494,8 +494,7 @@ ReadyFrameInBuffer VideoCaptureDeviceClient::CreateReadyFrameFromExternalBuffer(
   // If a buffer to retire was specified, retire one.
   if (buffer_id_to_drop != VideoCaptureBufferPool::kInvalidId) {
     auto entry_iter =
-        std::find(buffer_ids_known_by_receiver_.begin(),
-                  buffer_ids_known_by_receiver_.end(), buffer_id_to_drop);
+        base::ranges::find(buffer_ids_known_by_receiver_, buffer_id_to_drop);
     if (entry_iter != buffer_ids_known_by_receiver_.end()) {
       buffer_ids_known_by_receiver_.erase(entry_iter);
       receiver_->OnBufferRetired(buffer_id_to_drop);
@@ -551,8 +550,7 @@ VideoCaptureDeviceClient::ReserveOutputBuffer(const gfx::Size& frame_size,
     // |buffer_pool_| has decided to release a buffer. Notify receiver in case
     // the buffer has already been shared with it.
     auto entry_iter =
-        std::find(buffer_ids_known_by_receiver_.begin(),
-                  buffer_ids_known_by_receiver_.end(), buffer_id_to_drop);
+        base::ranges::find(buffer_ids_known_by_receiver_, buffer_id_to_drop);
     if (entry_iter != buffer_ids_known_by_receiver_.end()) {
       buffer_ids_known_by_receiver_.erase(entry_iter);
       receiver_->OnBufferRetired(buffer_id_to_drop);

media/capture/video/video_capture_feedback.cc

@@ -4,9 +4,9 @@
 
 #include "media/capture/video/video_capture_feedback.h"
 
-#include <algorithm>
 #include <cmath>
 
+#include "base/containers/contains.h"
 #include "base/logging.h"
 
 namespace media {
@@ -63,8 +63,7 @@ void VideoCaptureFeedback::Combine(const VideoCaptureFeedback& other) {
   // Merge mapped sizes for all consumers.
   for (const gfx::Size& mapped_size : other.mapped_sizes) {
     // Skip duplicates.
-    if (std::find(mapped_sizes.begin(), mapped_sizes.end(), mapped_size) !=
-        mapped_sizes.end()) {
+    if (base::Contains(mapped_sizes, mapped_size)) {
       continue;
     }
     // As a safety measure, limit the number of sizes that can be asked for.

media/capture/video_capture_types.cc

@@ -5,6 +5,7 @@
 #include "media/capture/video_capture_types.h"
 
 #include "base/check.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/stringprintf.h"
 #include "media/base/limits.h"
 
@@ -51,14 +52,8 @@ std::string VideoCaptureFormat::ToString(const VideoCaptureFormat& format) {
 bool VideoCaptureFormat::ComparePixelFormatPreference(
     const VideoPixelFormat& lhs,
     const VideoPixelFormat& rhs) {
-  auto* format_lhs = std::find(
-      kSupportedCapturePixelFormats,
-      kSupportedCapturePixelFormats + std::size(kSupportedCapturePixelFormats),
-      lhs);
-  auto* format_rhs = std::find(
-      kSupportedCapturePixelFormats,
-      kSupportedCapturePixelFormats + std::size(kSupportedCapturePixelFormats),
-      rhs);
+  auto* format_lhs = base::ranges::find(kSupportedCapturePixelFormats, lhs);
+  auto* format_rhs = base::ranges::find(kSupportedCapturePixelFormats, rhs);
   return format_lhs < format_rhs;
 }
 

media/cast/logging/log_event_dispatcher.cc

@@ -4,12 +4,13 @@
 
 #include "media/cast/logging/log_event_dispatcher.h"
 
-#include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
+#include "base/containers/contains.h"
 #include "base/location.h"
+#include "base/ranges/algorithm.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/cast/cast_environment.h"
 
@@ -125,14 +126,12 @@ void LogEventDispatcher::Impl::DispatchBatchOfEvents(
 }
 
 void LogEventDispatcher::Impl::Subscribe(RawEventSubscriber* subscriber) {
-  DCHECK(std::find(subscribers_.begin(), subscribers_.end(), subscriber) ==
-         subscribers_.end());
+  DCHECK(!base::Contains(subscribers_, subscriber));
   subscribers_.push_back(subscriber);
 }
 
 void LogEventDispatcher::Impl::Unsubscribe(RawEventSubscriber* subscriber) {
-  const auto it =
-      std::find(subscribers_.begin(), subscribers_.end(), subscriber);
+  const auto it = base::ranges::find(subscribers_, subscriber);
   DCHECK(it != subscribers_.end());
   subscribers_.erase(it);
 }

media/cast/net/pacing/paced_sender.cc

@@ -6,6 +6,7 @@
 
 #include "base/big_endian.h"
 #include "base/bind.h"
+#include "base/containers/contains.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 
@@ -299,8 +300,7 @@ PacketRef PacedSender::PopNextPacket(PacketType* packet_type,
 }
 
 bool PacedSender::IsHighPriority(const PacketKey& packet_key) const {
-  return std::find(priority_ssrcs_.begin(), priority_ssrcs_.end(),
-                   packet_key.ssrc) != priority_ssrcs_.end();
+  return base::Contains(priority_ssrcs_, packet_key.ssrc);
 }
 
 bool PacedSender::empty() const {

media/device_monitors/device_monitor_mac.mm

@@ -5,13 +5,16 @@
 #include "media/device_monitors/device_monitor_mac.h"
 
 #include <AVFoundation/AVFoundation.h>
+
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
+#include "base/containers/contains.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/raw_ptr.h"
+#include "base/ranges/algorithm.h"
 #include "base/task/task_runner_util.h"
 #include "base/threading/thread_checker.h"
 
@@ -92,7 +95,7 @@ void ConsolidateDevicesListAndNotify(
   std::vector<DeviceInfo>::const_iterator it;
   for (it = snapshot_devices.begin(); it != snapshot_devices.end(); ++it) {
     std::vector<DeviceInfo>::iterator cached_devices_iterator =
-        std::find(cached_devices_.begin(), cached_devices_.end(), *it);
+        base::ranges::find(cached_devices_, *it);
     if (cached_devices_iterator == cached_devices_.end()) {
       video_device_added |= ((it->type() == DeviceInfo::kVideo) ||
                              (it->type() == DeviceInfo::kMuxed));
@@ -374,8 +377,7 @@ - (void)startObserving:(base::scoped_nsobject<AVCaptureDevice>)device {
   DCHECK(_mainThreadChecker.CalledOnValidThread());
   DCHECK(device != nil);
   // Skip this device if there are already observers connected to it.
-  if (std::find(_monitoredDevices.begin(), _monitoredDevices.end(), device) !=
-      _monitoredDevices.end()) {
+  if (base::Contains(_monitoredDevices, device)) {
     return;
   }
   [device addObserver:self
@@ -394,7 +396,7 @@ - (void)stopObserving:(AVCaptureDevice*)device {
   DCHECK(device != nil);
 
   std::set<base::scoped_nsobject<AVCaptureDevice>>::iterator found =
-      std::find(_monitoredDevices.begin(), _monitoredDevices.end(), device);
+      base::ranges::find(_monitoredDevices, device);
   DCHECK(found != _monitoredDevices.end());
   [self removeObservers:*found];
   _monitoredDevices.erase(found);

media/filters/offloading_video_decoder.cc

@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
+#include "base/containers/contains.h"
 #include "base/synchronization/atomic_flag.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
@@ -94,8 +95,7 @@ void OffloadingVideoDecoder::Initialize(const VideoDecoderConfig& config,
   const bool disable_offloading =
       config.is_encrypted() ||
       config.coded_size().width() < min_offloading_width_ ||
-      std::find(supported_codecs_.begin(), supported_codecs_.end(),
-                config.codec()) == supported_codecs_.end();
+      !base::Contains(supported_codecs_, config.codec());
 
   if (initialized_) {
     initialized_ = false;

media/filters/source_buffer_state.cc

@@ -8,6 +8,7 @@
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
@@ -662,8 +663,8 @@ bool SourceBufferState::OnNewConfigs(
                << " config: " << audio_config.AsHumanReadableString();
       DCHECK(audio_config.IsValidConfig());
 
-      const auto& it = std::find(expected_acodecs.begin(),
-                                 expected_acodecs.end(), audio_config.codec());
+      const auto& it =
+          base::ranges::find(expected_acodecs, audio_config.codec());
       if (it == expected_acodecs.end()) {
         MEDIA_LOG(ERROR, media_log_) << "Audio stream codec "
                                      << GetCodecName(audio_config.codec())
@@ -730,8 +731,8 @@ bool SourceBufferState::OnNewConfigs(
       }
 #endif  // BUILDFLAG(ENABLE_PLATFORM_ENCRYPTED_DOLBY_VISION)
 
-      const auto& it = std::find(expected_vcodecs.begin(),
-                                 expected_vcodecs.end(), video_config.codec());
+      const auto& it =
+          base::ranges::find(expected_vcodecs, video_config.codec());
       if (it == expected_vcodecs.end()) {
         MEDIA_LOG(ERROR, media_log_) << "Video stream codec "
                                      << GetCodecName(video_config.codec())