diff --git a/net/base/data_url.cc b/net/base/data_url.cc index 8b6b01824d7cae..9125ba36eb2f91 100644 --- a/net/base/data_url.cc +++ b/net/base/data_url.cc @@ -4,14 +4,13 @@ // NOTE: based loosely on mozilla's nsDataChannel.cpp -#include - #include "net/base/data_url.h" #include "base/base64.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" #include "base/features.h" +#include "base/ranges/algorithm.h" #include "base/strings/escape.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" @@ -64,16 +63,12 @@ bool DataURL::Parse(const GURL& url, content = content_string; } - base::StringPiece::const_iterator begin = content.begin(); - base::StringPiece::const_iterator end = content.end(); - - base::StringPiece::const_iterator comma = std::find(begin, end, ','); - - if (comma == end) + base::StringPiece::const_iterator comma = base::ranges::find(content, ','); + if (comma == content.end()) return false; std::vector meta_data = - base::SplitStringPiece(base::MakeStringPiece(begin, comma), ";", + base::SplitStringPiece(base::MakeStringPiece(content.begin(), comma), ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); // These are moved to |mime_type| and |charset| on success. @@ -134,7 +129,7 @@ bool DataURL::Parse(const GURL& url, // spaces itself, anyways. Should we just trim leading spaces instead? // Allowing random intermediary spaces seems unnecessary. - auto raw_body = base::MakeStringPiece(comma + 1, end); + auto raw_body = base::MakeStringPiece(comma + 1, content.end()); // For base64, we may have url-escaped whitespace which is not part // of the data, and should be stripped. Otherwise, the escaped whitespace diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc index 1e033952aa2a85..343c648374cf11 100644 --- a/net/cert/ev_root_ca_metadata.cc +++ b/net/cert/ev_root_ca_metadata.cc @@ -10,8 +10,7 @@ #include #endif -#include - +#include "base/containers/contains.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/strings/string_piece.h" @@ -73,9 +72,7 @@ bool ConvertBytesToDottedString(const der::Input& policy_oid, bool EVRootCAMetadata::IsEVPolicyOID(PolicyOID policy_oid) const { for (const auto& ev_root : kEvRootCaMetadata) { - if (std::find(std::begin(ev_root.policy_oids), - std::end(ev_root.policy_oids), - policy_oid) != std::end(ev_root.policy_oids)) { + if (base::Contains(ev_root.policy_oids, policy_oid)) { return true; } } @@ -100,9 +97,7 @@ bool EVRootCAMetadata::HasEVPolicyOID(const SHA256HashValue& fingerprint, for (const auto& ev_root : kEvRootCaMetadata) { if (fingerprint != ev_root.fingerprint) continue; - return std::find(std::begin(ev_root.policy_oids), - std::end(ev_root.policy_oids), - policy_oid) != std::end(ev_root.policy_oids); + return base::Contains(ev_root.policy_oids, policy_oid); } auto it = extra_cas_.find(fingerprint); diff --git a/net/cert/pki/ocsp.cc b/net/cert/pki/ocsp.cc index 5dcc82dbd97f6f..dcecebbbbf5963 100644 --- a/net/cert/pki/ocsp.cc +++ b/net/cert/pki/ocsp.cc @@ -4,9 +4,8 @@ #include "net/cert/pki/ocsp.h" -#include - #include "base/base64.h" +#include "base/containers/contains.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "net/cert/asn1_util.h" @@ -590,14 +589,9 @@ scoped_refptr OCSPParseCertificate(base::StringPiece der) { // part of the extended key usage extension. if (!responder_certificate->has_extended_key_usage()) return false; - const std::vector& ekus = - responder_certificate->extended_key_usage(); - if (std::find(ekus.begin(), ekus.end(), der::Input(kOCSPSigning)) == - ekus.end()) { - return false; - } - return true; + return base::Contains(responder_certificate->extended_key_usage(), + der::Input(kOCSPSigning)); } [[nodiscard]] bool VerifyOCSPResponseSignatureGivenCert( diff --git a/net/cert_net/cert_net_fetcher_url_request.cc b/net/cert_net/cert_net_fetcher_url_request.cc index 843dcb7d5c0748..fad520b0221fa3 100644 --- a/net/cert_net/cert_net_fetcher_url_request.cc +++ b/net/cert_net/cert_net_fetcher_url_request.cc @@ -68,6 +68,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_math.h" +#include "base/ranges/algorithm.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" @@ -461,7 +462,7 @@ void Job::AttachRequest( void Job::DetachRequest(CertNetFetcherURLRequest::RequestCore* request) { std::unique_ptr delete_this; - auto it = std::find(requests_.begin(), requests_.end(), request); + auto it = base::ranges::find(requests_, request); DCHECK(it != requests_.end()); requests_.erase(it); diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc index 3fb54fb04b02a7..38894d02099da4 100644 --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc @@ -4,7 +4,6 @@ #include "net/dns/host_resolver_manager.h" -#include #include #include #include @@ -1990,8 +1989,7 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, // available and |fallback_only| is false, a job that is currently running an // insecure DnsTask will be completed with |error|. void AbortInsecureDnsTask(int error, bool fallback_only) { - bool has_system_fallback = std::find(tasks_.begin(), tasks_.end(), - TaskType::SYSTEM) != tasks_.end(); + bool has_system_fallback = base::Contains(tasks_, TaskType::SYSTEM); if (has_system_fallback) { for (auto it = tasks_.begin(); it != tasks_.end();) { if (*it == TaskType::DNS) diff --git a/net/dns/https_record_rdata.cc b/net/dns/https_record_rdata.cc index cc52bae1f041ab..58693d7addc5a3 100644 --- a/net/dns/https_record_rdata.cc +++ b/net/dns/https_record_rdata.cc @@ -6,7 +6,6 @@ #include -#include #include #include #include @@ -16,6 +15,7 @@ #include "base/big_endian.h" #include "base/check.h" +#include "base/containers/contains.h" #include "base/dcheck_is_on.h" #include "base/immediate_crash.h" #include "base/memory/ptr_util.h" @@ -447,8 +447,7 @@ bool ServiceFormHttpsRecordRdata::IsCompatible() const { // static bool ServiceFormHttpsRecordRdata::IsSupportedKey(uint16_t key) { #if DCHECK_IS_ON() - return std::find(std::begin(kSupportedKeys), std::end(kSupportedKeys), key) != - std::end(kSupportedKeys); + return base::Contains(kSupportedKeys, key); #else // Only intended for DCHECKs. IMMEDIATE_CRASH(); diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 8d5fc578ce7ca5..2bd3f6a479f867 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -4,7 +4,6 @@ #include "net/http/http_cache.h" -#include #include #include "base/bind.h" @@ -21,6 +20,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/pickle.h" +#include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -936,8 +936,7 @@ void HttpCache::DoneWithEntry(ActiveEntry* entry, entry->GetEntry()->CancelSparseIO(); // Transaction is waiting in the done_headers_queue. - auto it = std::find(entry->done_headers_queue.begin(), - entry->done_headers_queue.end(), transaction); + auto it = base::ranges::find(entry->done_headers_queue, transaction); if (it != entry->done_headers_queue.end()) { entry->done_headers_queue.erase(it); diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc index 5fed78600aab79..17d9b46cc3d2d6 100644 --- a/net/http/http_response_headers.cc +++ b/net/http/http_response_headers.cc @@ -19,6 +19,7 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/pickle.h" +#include "base/ranges/algorithm.h" #include "base/strings/escape.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" @@ -460,8 +461,7 @@ void HttpResponseHeaders::Parse(const std::string& raw_input) { // ParseStatusLine adds a normalized status line to raw_headers_ std::string::const_iterator line_begin = raw_input.begin(); - std::string::const_iterator line_end = - std::find(line_begin, raw_input.end(), '\0'); + std::string::const_iterator line_end = base::ranges::find(raw_input, '\0'); // has_headers = true, if there is any data following the status line. // Used by ParseStatusLine() to decide if a HTTP/0.9 is really a HTTP/1.0. bool has_headers = @@ -545,10 +545,9 @@ std::string HttpResponseHeaders::GetStatusText() const { // ' SP ' or // ' SP SP '. std::string status_text = GetStatusLine(); - std::string::const_iterator begin = status_text.begin(); - std::string::const_iterator end = status_text.end(); // Seek to beginning of . - begin = std::find(begin, end, ' '); + std::string::const_iterator begin = base::ranges::find(status_text, ' '); + std::string::const_iterator end = status_text.end(); CHECK(begin != end); ++begin; CHECK(begin != end); diff --git a/net/http/http_stream_factory_job_controller_unittest.cc b/net/http/http_stream_factory_job_controller_unittest.cc index ca66994ae6dfb9..c1aa49f13d6f3a 100644 --- a/net/http/http_stream_factory_job_controller_unittest.cc +++ b/net/http/http_stream_factory_job_controller_unittest.cc @@ -4,13 +4,13 @@ #include "net/http/http_stream_factory_job_controller.h" -#include #include #include #include #include #include +#include "base/containers/contains.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" @@ -3698,8 +3698,7 @@ TEST_P(HttpStreamFactoryJobControllerTest, GetAlternativeServiceInfoFor) { quic::ParsedQuicVersion unsupported_version_2 = quic::ParsedQuicVersion::Unsupported(); for (const quic::ParsedQuicVersion& version : quic::AllSupportedVersions()) { - if (std::find(supported_versions.begin(), supported_versions.end(), - version) != supported_versions.end()) + if (base::Contains(supported_versions, version)) continue; if (unsupported_version_1 == quic::ParsedQuicVersion::Unsupported()) { unsupported_version_1 = version; diff --git a/net/log/net_log.cc b/net/log/net_log.cc index b46b4b6df041a6..531773407379f3 100644 --- a/net/log/net_log.cc +++ b/net/log/net_log.cc @@ -8,6 +8,7 @@ #include "base/containers/contains.h" #include "base/no_destructor.h" #include "base/notreached.h" +#include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/log/net_log_values.h" @@ -104,7 +105,7 @@ void NetLog::RemoveObserver(NetLog::ThreadSafeObserver* observer) { DCHECK_EQ(this, observer->net_log_); - auto it = std::find(observers_.begin(), observers_.end(), observer); + auto it = base::ranges::find(observers_, observer); DCHECK(it != observers_.end()); observers_.erase(it); @@ -132,8 +133,7 @@ void NetLog::RemoveCaptureModeObserver( DCHECK_EQ(this, observer->net_log_); DCHECK(HasCaptureModeObserver(observer)); - auto it = std::find(capture_mode_observers_.begin(), - capture_mode_observers_.end(), observer); + auto it = base::ranges::find(capture_mode_observers_, observer); DCHECK(it != capture_mode_observers_.end()); capture_mode_observers_.erase(it); diff --git a/net/proxy_resolution/mock_proxy_resolver.cc b/net/proxy_resolution/mock_proxy_resolver.cc index 55eeb2088a098f..13710b18c5f5e6 100644 --- a/net/proxy_resolution/mock_proxy_resolver.cc +++ b/net/proxy_resolution/mock_proxy_resolver.cc @@ -8,6 +8,7 @@ #include #include "base/check.h" +#include "base/ranges/algorithm.h" namespace net { @@ -64,7 +65,7 @@ int MockAsyncProxyResolver::GetProxyForURL( } void MockAsyncProxyResolver::AddCancelledJob(std::unique_ptr job) { - auto it = std::find(pending_jobs_.begin(), pending_jobs_.end(), job.get()); + auto it = base::ranges::find(pending_jobs_, job.get()); // Because this is called always when RequestImpl is destructed, // we need to check if it is still in pending jobs. if (it != pending_jobs_.end()) { @@ -75,7 +76,7 @@ void MockAsyncProxyResolver::AddCancelledJob(std::unique_ptr job) { void MockAsyncProxyResolver::RemovePendingJob(Job* job) { DCHECK(job); - auto it = std::find(pending_jobs_.begin(), pending_jobs_.end(), job); + auto it = base::ranges::find(pending_jobs_, job); DCHECK(it != pending_jobs_.end()); pending_jobs_.erase(it); } @@ -155,8 +156,7 @@ int MockAsyncProxyResolverFactory::CreateProxyResolver( } void MockAsyncProxyResolverFactory::RemovePendingRequest(Request* request) { - auto it = - std::find(pending_requests_.begin(), pending_requests_.end(), request); + auto it = base::ranges::find(pending_requests_, request); DCHECK(it != pending_requests_.end()); pending_requests_.erase(it); } diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc index 68beb48d728bad..1232719cbb576f 100644 --- a/net/quic/quic_chromium_client_session.cc +++ b/net/quic/quic_chromium_client_session.cc @@ -18,6 +18,7 @@ #include "base/metrics/sparse_histogram.h" #include "base/no_destructor.h" #include "base/observer_list.h" +#include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" @@ -1314,8 +1315,7 @@ int QuicChromiumClientSession::TryCreateStream(StreamRequest* request) { void QuicChromiumClientSession::CancelRequest(StreamRequest* request) { // Remove |request| from the queue while preserving the order of the // other elements. - auto it = - std::find(stream_requests_.begin(), stream_requests_.end(), request); + auto it = base::ranges::find(stream_requests_, request); if (it != stream_requests_.end()) { it = stream_requests_.erase(it); } diff --git a/net/quic/quic_context.cc b/net/quic/quic_context.cc index c4921e5f39744b..481130a5190b2b 100644 --- a/net/quic/quic_context.cc +++ b/net/quic/quic_context.cc @@ -4,6 +4,7 @@ #include "net/quic/quic_context.h" +#include "base/containers/contains.h" #include "net/quic/platform/impl/quic_chromium_clock.h" #include "net/quic/quic_chromium_connection_helper.h" #include "net/third_party/quiche/src/quiche/quic/core/crypto/crypto_protocol.h" @@ -53,8 +54,7 @@ quic::QuicConfig InitializeQuicConfig(const QuicParams& params) { quic::QuicTime::Delta::FromMicroseconds( params.max_idle_time_before_crypto_handshake.InMicroseconds())); quic::QuicTagVector copt_to_send = params.connection_options; - if (std::find(copt_to_send.begin(), copt_to_send.end(), quic::kRVCM) == - copt_to_send.end()) { + if (!base::Contains(copt_to_send, quic::kRVCM)) { copt_to_send.push_back(quic::kRVCM); } config.SetConnectionOptionsToSend(copt_to_send); diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index ffa5be08efc08d..0bb4794dd9c27f 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -4,7 +4,6 @@ #include "net/quic/quic_stream_factory.h" -#include #include #include #include @@ -474,11 +473,7 @@ class QuicStreamFactory::Job { IPEndPoint stale_address = resolve_host_request_->GetAddressResults()->front(); - if (std::find(endpoints.begin(), endpoints.end(), stale_address) != - endpoints.end()) { - return true; - } - return false; + return base::Contains(endpoints, stale_address); } void LogStaleHostRacing(bool used) { diff --git a/net/reporting/reporting_cache_unittest.cc b/net/reporting/reporting_cache_unittest.cc index f4cdfd771c5465..0a5afcbf39a64e 100644 --- a/net/reporting/reporting_cache_unittest.cc +++ b/net/reporting/reporting_cache_unittest.cc @@ -4,11 +4,11 @@ #include "net/reporting/reporting_cache.h" -#include #include #include #include "base/bind.h" +#include "base/containers/contains.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" @@ -129,7 +129,7 @@ class ReportingCacheTest : public ReportingTestBase, for (const ReportingReport* report : after) { // If report isn't in before, we've found the new instance. - if (std::find(before.begin(), before.end(), report) == before.end()) { + if (!base::Contains(before, report)) { EXPECT_EQ(network_isolation_key, report->network_isolation_key); EXPECT_EQ(url, report->url); EXPECT_EQ(user_agent, report->user_agent); diff --git a/net/ssl/ssl_platform_key_win.cc b/net/ssl/ssl_platform_key_win.cc index e974a4b0a2b097..c6fb00d0fea482 100644 --- a/net/ssl/ssl_platform_key_win.cc +++ b/net/ssl/ssl_platform_key_win.cc @@ -4,13 +4,13 @@ #include "net/ssl/ssl_platform_key_win.h" -#include #include #include #include #include #include "base/logging.h" +#include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "crypto/openssl_util.h" #include "crypto/scoped_capi_types.h" @@ -39,7 +39,7 @@ std::string GetCAPIProviderName(HCRYPTPROV provider) { } // Per Microsoft's documentation, PP_NAME is NUL-terminated. However, // smartcard drivers are notoriously buggy, so check this. - auto nul = std::find(name.begin(), name.end(), 0); + auto nul = base::ranges::find(name, 0); if (nul != name.end()) { name_len = nul - name.begin(); } @@ -204,7 +204,7 @@ std::wstring GetCNGProviderName(NCRYPT_KEY_HANDLE key) { // Per Microsoft's documentation, the name is NUL-terminated. However, // smartcard drivers are notoriously buggy, so check this. - auto nul = std::find(name.begin(), name.end(), 0); + auto nul = base::ranges::find(name, 0); if (nul != name.end()) { name.erase(nul, name.end()); }