Skip to content

Commit

Permalink
Swap from base/stl_util.h to cxx17_backports.h in media/ .cc files.
Browse files Browse the repository at this point in the history 
base::size() has been moved to base/cxx17_backports.h, so .cc files that
use base::size(), but no other function from base/stl_util.h, can
directly include base/cxx17_backports.h and not base/stl_util.h.

Bug: 1210983
Change-Id: I39629a33bc97777c64e412601d558cd275422e06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2918002
Commit-Queue: Lei Zhang <thestig@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Auto-Submit: Lei Zhang <thestig@chromium.org>
Reviewed-by: Joe Mason <joenotcharles@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#886859}
  • Loading branch information
@leizleiz
leizleiz authored and Chromium LUCI CQ committed May 26, 2021
1 parent 13b317f commit 079df01
Show file tree
Hide file tree
Showing 127 changed files with 129 additions and 129 deletions.
2 changes: 1 addition & 1 deletion media/audio/alsa/alsa_input.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <stddef.h>

#include "base/bind.h"
#include "base/cxx17_backports.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "media/audio/alsa/alsa_output.h"
#include "media/audio/alsa/alsa_util.h"
#include "media/audio/alsa/alsa_wrapper.h"
Expand Down
6 changes: 3 additions & 3 deletions media/audio/alsa/audio_manager_alsa.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
#include <stddef.h>

#include "base/command_line.h"
#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "media/audio/audio_device_description.h"
#include "media/audio/audio_output_dispatcher.h"
#include "media/audio/alsa/alsa_input.h"
#include "media/audio/alsa/alsa_output.h"
#include "media/audio/alsa/alsa_wrapper.h"
#include "media/audio/audio_device_description.h"
#include "media/audio/audio_output_dispatcher.h"
#if defined(USE_PULSEAUDIO)
#include "media/audio/pulse/audio_manager_pulse.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion media/audio/android/opensles_input.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "media/audio/android/opensles_input.h"

#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/trace_event/trace_event.h"
#include "media/audio/android/audio_manager_android.h"
#include "media/base/audio_bus.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/android/opensles_output.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include "media/audio/android/opensles_output.h"

#include "base/android/build_info.h"
#include "base/cxx17_backports.h"
#include "base/feature_list.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/cras/audio_manager_chromeos.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include "base/bind.h"
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/cxx17_backports.h"
#include "base/environment.h"
#include "base/metrics/field_trial_params.h"
#include "base/nix/xdg_util.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/system/sys_info.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/cras/cras_input.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <math.h>
#include <algorithm>

#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "media/audio/audio_device_description.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/cras/cras_unified.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <algorithm>

#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "media/audio/cras/audio_manager_cras_base.h"

Expand Down
2 changes: 1 addition & 1 deletion media/audio/wav_audio_handler_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <memory>
#include <string>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_piece.h"
#include "media/audio/test_data.h"
#include "media/base/audio_bus.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/win/audio_low_latency_input_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include <memory>
#include <utility>

#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/trace_event/trace_event.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/win/audio_low_latency_output_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

#include "base/callback.h"
#include "base/command_line.h"
#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
Expand Down
2 changes: 1 addition & 1 deletion media/audio/win/avrt_wrapper_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "media/audio/win/avrt_wrapper_win.h"

#include "base/check.h"
#include "base/stl_util.h"
#include "base/cxx17_backports.h"

namespace avrt {

Expand Down
2 changes: 1 addition & 1 deletion media/audio/win/core_audio_util_win_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <stddef.h>
#include <stdint.h>

#include "base/cxx17_backports.h"
#include "base/macros.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/metrics/histogram_tester.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/android/media_drm_bridge.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
#include "base/android/jni_string.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/cxx17_backports.h"
#include "base/feature_list.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/sys_byteorder.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/audio_bus_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <limits>
#include <memory>

#include "base/cxx17_backports.h"
#include "base/memory/aligned_memory.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/test/bind.h"
#include "base/time/time.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/audio_hash.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include "media/base/audio_hash.h"

#include "base/cxx17_backports.h"
#include "base/numerics/math_constants.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "media/base/audio_bus.h"

Expand Down
2 changes: 1 addition & 1 deletion media/base/audio_parameters_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <stddef.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_number_conversions.h"
#include "media/base/audio_parameters.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/audio_renderer_mixer_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/task_environment.h"
#include "base/threading/platform_thread.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/audio_timestamp_helper_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <stddef.h>
#include <stdint.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "media/base/audio_timestamp_helper.h"
#include "media/base/timestamp_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/bit_reader_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <stddef.h>
#include <stdint.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace media {
Expand Down
2 changes: 1 addition & 1 deletion media/base/channel_layout.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <stddef.h>

#include "base/check_op.h"
#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/stl_util.h"

namespace media {

Expand Down
2 changes: 1 addition & 1 deletion media/base/channel_mixer_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <memory>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/stringprintf.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/channel_mixing_matrix_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <stddef.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/stringprintf.h"
#include "media/base/channel_mixer.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/container_names.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <limits>

#include "base/check_op.h"
#include "base/cxx17_backports.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
#include "media/base/bit_reader.h"

namespace media {
Expand Down
2 changes: 1 addition & 1 deletion media/base/data_buffer_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <memory>
#include <utility>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion media/base/decoder_buffer_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

#include <memory>

#include "base/cxx17_backports.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/fake_demuxer_stream.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/cxx17_backports.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/decoder_buffer.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/key_systems.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#include <memory>
#include <unordered_map>

#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/mime_util_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <stddef.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "base/test/scoped_command_line.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/seekable_buffer_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <cstdlib>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/time/time.h"
#include "media/base/data_buffer.h"
#include "media/base/timestamp_constants.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/test_data_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

#include "base/check_op.h"
#include "base/containers/flat_map.h"
#include "base/cxx17_backports.h"
#include "base/files/file_util.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
#include "base/path_service.h"
#include "base/stl_util.h"
#include "media/base/decoder_buffer.h"

namespace media {
Expand Down
2 changes: 1 addition & 1 deletion media/base/unaligned_shared_memory_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <limits>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace media {
Expand Down
2 changes: 1 addition & 1 deletion media/base/video_frame.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include "base/bind.h"
#include "base/bits.h"
#include "base/callback_helpers.h"
#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/process/memory.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
Expand Down
2 changes: 1 addition & 1 deletion media/base/video_frame_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/cxx17_backports.h"
#include "base/format_macros.h"
#include "base/memory/aligned_memory.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
Expand Down
2 changes: 1 addition & 1 deletion media/blink/cache_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <string>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
Expand Down
2 changes: 1 addition & 1 deletion media/blink/cache_util_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <string>

#include "base/cxx17_backports.h"
#include "base/format_macros.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
Expand Down
2 changes: 1 addition & 1 deletion media/blink/multibuffer_data_source_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#include <utility>

#include "base/bind.h"
#include "base/cxx17_backports.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/task_environment.h"
#include "media/base/media_switches.h"
Expand Down
2 changes: 1 addition & 1 deletion media/capture/content/capture_resolution_chooser_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <stddef.h>

#include "base/cxx17_backports.h"
#include "base/location.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/size.h"

Expand Down
Loading

0 comments on commit 079df01

Please sign in to comment.