Skip to content

Commit

Permalink
[base] Change #include for base::Contains [5/5]
Browse files Browse the repository at this point in the history
This is a mechanical change replacing #includes of base/stl_util.h
with base/containers/contains.h for usages of base::Contains.
Furthermore, this change modifies third_party/blink/renderer/DEPS to
allow the inclusion of the new header.

TBR=dcheng

Bug: 970209
Change-Id: I9140906d14ddd64da1f085fac408015554ffd5be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2580881
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835437}
  • Loading branch information
jdoerrie authored and Chromium LUCI CQ committed Dec 9, 2020
1 parent 958cc03 commit 721926d
Show file tree
Hide file tree
Showing 142 changed files with 142 additions and 135 deletions.
2 changes: 1 addition & 1 deletion printing/backend/cups_jobs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <memory>
#include <string>

#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
#include "base/threading/scoped_blocking_call.h"
Expand Down
2 changes: 1 addition & 1 deletion printing/backend/test_print_backend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <utility>

#include "base/check.h"
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "printing/backend/print_backend.h"

namespace printing {
Expand Down
2 changes: 1 addition & 1 deletion printing/metafile_skia.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/files/file.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
#include "base/time/time.h"
#include "base/unguessable_token.h"
#include "cc/paint/paint_record.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/touch_injector_win_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <map>
#include <utility>

#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "remoting/proto/event.pb.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion services/audio/group_coordinator_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "services/audio/test/mock_group_coordinator.h"

#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "base/unguessable_token.h"
#include "services/audio/test/mock_group_member.h"
#include "testing/gmock/include/gmock/gmock.h"
Expand Down
2 changes: 1 addition & 1 deletion services/audio/loopback_stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <string>

#include "base/bind.h"
#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "base/sync_socket.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/time/default_tick_clock.h"
Expand Down
2 changes: 1 addition & 1 deletion services/audio/output_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/task_runner_util.h"
#include "base/threading/platform_thread.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/bluetooth/bluetooth_system_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <vector>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/observer_list.h"
#include "base/optional.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/test/bind.h"
#include "device/bluetooth/dbus/bluetooth_adapter_client.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/generic_sensor/platform_sensor_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <utility>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "services/device/generic_sensor/platform_sensor_fusion_algorithm.h"

#include <cmath>
#include "base/stl_util.h"
#include "base/containers/contains.h"

namespace device {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <utility>

#include "base/bind.h"
#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "services/device/public/mojom/sensor_provider.mojom.h"

namespace device {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <utility>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/memory/scoped_refptr.h"
#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/task/post_task.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/hid/hid_connection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <algorithm>

#include "base/containers/contains.h"
#include "base/memory/ref_counted_memory.h"
#include "base/stl_util.h"
#include "components/device_event_log/device_event_log.h"
#include "services/device/public/cpp/hid/hid_usage_and_page.h"
#include "services/device/public/mojom/hid.mojom.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/hid/hid_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

#include "base/at_exit.h"
#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "build/build_config.h"
#include "components/device_event_log/device_event_log.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/public/cpp/test/fake_usb_device_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <utility>
#include <vector>

#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/chromeos_buildflags.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/mojo/device_impl_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
#include <vector>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/queue.h"
#include "base/macros.h"
#include "base/memory/ref_counted_memory.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/receiver.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/usb_device_handle_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/location.h"
#include "base/macros.h"
#include "base/memory/ref_counted_memory.h"
#include "base/sequence_checker.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/threading/scoped_blocking_call.h"
#include "base/threading/thread_task_runner_handle.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/usb_device_handle_usbfs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

#include "base/bind.h"
#include "base/cancelable_callback.h"
#include "base/containers/contains.h"
#include "base/files/file_descriptor_watcher_posix.h"
#include "base/logging.h"
#include "base/memory/ref_counted_memory.h"
#include "base/numerics/checked_math.h"
#include "base/posix/eintr_wrapper.h"
#include "base/sequence_checker.h"
#include "base/stl_util.h"
#include "base/threading/scoped_blocking_call.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/device_event_log/device_event_log.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/usb_device_handle_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/location.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted_memory.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/usb_service_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#include "base/barrier_closure.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/location.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/thread_pool.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/usb_service_linux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <vector>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
Expand All @@ -18,7 +19,6 @@
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observer.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/scoped_blocking_call.h"
Expand Down
2 changes: 1 addition & 1 deletion services/device/usb/usb_service_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#include <devpkey.h>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/location.h"
#include "base/memory/free_deleter.h"
#include "base/memory/ptr_util.h"
#include "base/scoped_generic.h"
#include "base/single_thread_task_runner.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
1 change: 1 addition & 0 deletions services/image_annotation/annotator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "base/base64.h"
#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/json/json_writer.h"
#include "base/location.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <utility>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/ranges/algorithm.h"
#include "base/stl_util.h"

namespace media_session {
namespace test {
Expand Down
2 changes: 1 addition & 1 deletion services/network/cors/cors_url_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include "services/network/cors/cors_url_loader.h"

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/flat_set.h"
#include "base/feature_list.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "net/base/load_flags.h"
#include "net/http/http_status_code.h"
Expand Down
2 changes: 1 addition & 1 deletion services/network/network_context_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/containers/span.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
Expand All @@ -26,7 +27,6 @@
#include "base/power_monitor/power_monitor.h"
#include "base/power_monitor/power_monitor_source.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
Expand Down
2 changes: 1 addition & 1 deletion services/network/network_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.h"
#include "base/environment.h"
Expand All @@ -18,7 +19,6 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/ranges.h"
#include "base/stl_util.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "base/timer/timer.h"
Expand Down
2 changes: 1 addition & 1 deletion services/network/origin_policy/origin_policy_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <utility>

#include "base/check.h"
#include "base/containers/contains.h"
#include "base/optional.h"
#include "base/stl_util.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "net/http/http_util.h"
#include "services/network/network_context.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "services/network/origin_policy/origin_policy_parsed_header.h"

#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "net/http/structured_headers.h"

namespace network {
Expand Down
2 changes: 1 addition & 1 deletion services/network/p2p/socket_udp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include "services/network/p2p/socket_udp.h"

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "services/network/public/cpp/content_security_policy/content_security_policy.h"

#include "base/stl_util.h"
#include "base/containers/contains.h"
#include "base/strings/stringprintf.h"
#include "net/http/http_response_headers.h"
#include "services/network/public/cpp/content_security_policy/csp_context.h"
Expand Down
2 changes: 1 addition & 1 deletion services/network/public/cpp/cross_origin_read_blocking.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

#include "base/check_op.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/containers/fixed_flat_set.h"
#include "base/feature_list.h"
#include "base/lazy_instance.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "net/base/mime_sniffer.h"
Expand Down
2 changes: 1 addition & 1 deletion services/network/quic_transport_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <set>
#include <vector>

#include "base/containers/contains.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
Expand Down
2 changes: 1 addition & 1 deletion services/network/resource_scheduler/resource_scheduler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
#include <utility>

#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/macros.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/optional.h"
#include "base/sequenced_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/supports_user_data.h"
#include "base/threading/thread_task_runner_handle.h"
Expand Down
Loading

0 comments on commit 721926d

Please sign in to comment.