Swap out base/stl_util.h for base/containers/contains.h.
Files that only use base::Contains() and no other base/stl_util.h helper
can replace base/stl_util.h with base/containers/contains.h.
Use grep to find all the files that include base/stl_util.h. Then filter
out the ones that need base/stl_util.h by running "grep -L base::func"
where "func" is a function that base/stl_util.h provides. For the
remaining files, grep for ones that use base::Contains(), and do search
and replace for stl_util.h. Take the resulting CL and run clang format.
Bug: 970209
Change-Id: I2fb47d7c91d910a2d431ab178b398f9bfa0eb8c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2853072
Owners-Override: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#877398}
NOKEYCHECK=True
GitOrigin-RevId: de1976728f093f7e7f9f23d6fc9561f000fb1bd6
diff --git a/base/expiring_cache_unittest.cc b/base/expiring_cache_unittest.cc
index 1f3c5d3..536b954 100644
--- a/base/expiring_cache_unittest.cc
+++ b/base/expiring_cache_unittest.cc
@@ -7,7 +7,7 @@
#include <functional>
#include <string>
-#include "base/stl_util.h"
+#include "base/containers/contains.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/base/filename_util_internal.cc b/base/filename_util_internal.cc
index 90b8b40..ddb9427 100644
--- a/base/filename_util_internal.cc
+++ b/base/filename_util_internal.cc
@@ -4,9 +4,9 @@
#include "net/base/filename_util.h"
+#include "base/containers/contains.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/base/mime_util_unittest.cc b/base/mime_util_unittest.cc
index 176b458..060caed 100644
--- a/base/mime_util_unittest.cc
+++ b/base/mime_util_unittest.cc
@@ -4,7 +4,7 @@
#include "net/base/mime_util.h"
-#include "base/stl_util.h"
+#include "base/containers/contains.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
diff --git a/dns/dns_util.cc b/dns/dns_util.cc
index 09e1dce..ae4e063 100644
--- a/dns/dns_util.cc
+++ b/dns/dns_util.cc
@@ -13,10 +13,10 @@
#include <vector>
#include "base/big_endian.h"
+#include "base/containers/contains.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/optional.h"
-#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "build/build_config.h"
diff --git a/http/http_auth_handler_factory.cc b/http/http_auth_handler_factory.cc
index 3f065ce..4617186 100644
--- a/http/http_auth_handler_factory.cc
+++ b/http/http_auth_handler_factory.cc
@@ -6,8 +6,8 @@
#include <set>
+#include "base/containers/contains.h"
#include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
#include "net/base/net_errors.h"
diff --git a/http/http_server_properties.cc b/http/http_server_properties.cc
index 7f67a27..037d6b4 100644
--- a/http/http_server_properties.cc
+++ b/http/http_server_properties.cc
@@ -6,11 +6,11 @@
#include "base/bind.h"
#include "base/check_op.h"
+#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/http/http_stream_factory_job.cc b/http/http_stream_factory_job.cc
index 652c943..7b1904c 100644
--- a/http/http_stream_factory_job.cc
+++ b/http/http_stream_factory_job.cc
@@ -11,13 +11,13 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
#include "base/notreached.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/threading/thread_task_runner_handle.h"
diff --git a/http/transport_security_state.cc b/http/transport_security_state.cc
index 5044657..b47f43a 100644
--- a/http/transport_security_state.cc
+++ b/http/transport_security_state.cc
@@ -13,6 +13,7 @@
#include "base/base64.h"
#include "base/bind.h"
#include "base/build_time.h"
+#include "base/containers/contains.h"
#include "base/containers/span.h"
#include "base/feature_list.h"
#include "base/json/json_writer.h"
@@ -22,7 +23,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/optional.h"
-#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/quic/platform/impl/quic_map_util_impl.h b/quic/platform/impl/quic_map_util_impl.h
index c25e1c4..006877a 100644
--- a/quic/platform/impl/quic_map_util_impl.h
+++ b/quic/platform/impl/quic_map_util_impl.h
@@ -5,7 +5,7 @@
#ifndef NET_QUIC_PLATFORM_IMPL_QUIC_MAP_UTIL_IMPL_H_
#define NET_QUIC_PLATFORM_IMPL_QUIC_MAP_UTIL_IMPL_H_
-#include "base/stl_util.h"
+#include "base/containers/contains.h"
namespace quic {
diff --git a/quic/quic_chromium_client_session.cc b/quic/quic_chromium_client_session.cc
index bffd7d9..9575411 100644
--- a/quic/quic_chromium_client_session.cc
+++ b/quic/quic_chromium_client_session.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/bind.h"
+#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
@@ -16,7 +17,6 @@
#include "base/metrics/sparse_histogram.h"
#include "base/no_destructor.h"
#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/task/post_task.h"
diff --git a/spdy/spdy_session.cc b/spdy/spdy_session.cc
index 9f249ae..8f353ba 100644
--- a/spdy/spdy_session.cc
+++ b/spdy/spdy_session.cc
@@ -11,12 +11,12 @@
#include <utility>
#include "base/bind.h"
+#include "base/containers/contains.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
#include "base/strings/abseil_string_conversions.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
diff --git a/spdy/spdy_session_pool.cc b/spdy/spdy_session_pool.cc
index 8841902..53a1201 100644
--- a/spdy/spdy_session_pool.cc
+++ b/spdy/spdy_session_pool.cc
@@ -9,8 +9,8 @@
#include "base/bind.h"
#include "base/check_op.h"
+#include "base/containers/contains.h"
#include "base/metrics/histogram_macros.h"
-#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/memory_allocator_dump.h"
diff --git a/url_request/url_request_job_factory.cc b/url_request/url_request_job_factory.cc
index dceb26f..8ff76c5 100644
--- a/url_request/url_request_job_factory.cc
+++ b/url_request/url_request_job_factory.cc
@@ -4,7 +4,7 @@
#include "net/url_request/url_request_job_factory.h"
-#include "base/stl_util.h"
+#include "base/containers/contains.h"
#include "net/base/net_errors.h"
#include "net/net_buildflags.h"
#include "net/url_request/url_request.h"
