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

Simplifies code slightly.

Bug: 1368812
Change-Id: Ic90fc9b5569ab4f430f5b400557537d733d2791e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3929295
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: David Schinazi <dschinazi@chromium.org>
Commit-Queue: David Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1053621}

net/base/data_url.cc

@@ -4,14 +4,13 @@
 
 // NOTE: based loosely on mozilla's nsDataChannel.cpp
 
-#include <algorithm>
-
 #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<base::StringPiece> 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

net/cert/ev_root_ca_metadata.cc

@@ -10,8 +10,7 @@
 #include <stdlib.h>
 #endif
 
-#include <algorithm>
-
+#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);

net/cert/pki/ocsp.cc

@@ -4,9 +4,8 @@
 
 #include "net/cert/pki/ocsp.h"
 
-#include <algorithm>
-
 #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<ParsedCertificate> OCSPParseCertificate(base::StringPiece der) {
   // part of the extended key usage extension.
   if (!responder_certificate->has_extended_key_usage())
     return false;
-  const std::vector<der::Input>& 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(

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<Job> 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);
 

net/dns/host_resolver_manager.cc

@@ -4,7 +4,6 @@
 
 #include "net/dns/host_resolver_manager.h"
 
-#include <algorithm>
 #include <cmath>
 #include <iterator>
 #include <limits>
@@ -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)

net/dns/https_record_rdata.cc

@@ -6,7 +6,6 @@
 
 #include <stdint.h>
 
-#include <algorithm>
 #include <map>
 #include <memory>
 #include <set>
@@ -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();

net/http/http_cache.cc

@@ -4,7 +4,6 @@
 
 #include "net/http/http_cache.h"
 
-#include <algorithm>
 #include <utility>
 
 #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);
 

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 {
   // '<http_version> SP <response_code>' or
   // '<http_version> SP <response_code> SP <status_text>'.
   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 <response_code>.
-  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);

net/http/http_stream_factory_job_controller_unittest.cc

@@ -4,13 +4,13 @@
 
 #include "net/http/http_stream_factory_job_controller.h"
 
-#include <algorithm>
 #include <list>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#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;

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);
 

net/proxy_resolution/mock_proxy_resolver.cc

@@ -8,6 +8,7 @@
 #include <utility>
 
 #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> 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> 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);
 }

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);
   }

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);

net/quic/quic_stream_factory.cc

@@ -4,7 +4,6 @@
 
 #include "net/quic/quic_stream_factory.h"
 
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <tuple>
@@ -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) {

net/reporting/reporting_cache_unittest.cc

@@ -4,11 +4,11 @@
 
 #include "net/reporting/reporting_cache.h"
 
-#include <algorithm>
 #include <string>
 #include <utility>
 
 #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);