redaction_tool: Switch from base::ranges to std::ranges CL:6215440 removes base::ranges. Switch to std::ranges so a compatibility patch in libchrome can be removed. BUG=b:393368038 TEST=CQ Change-Id: I2f920a51ecf3763cea9e4f3f20b7e7a19ef32ede Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/redaction_tool/+/6219452 Reviewed-by: Ahmed Fakhry <afakhry@chromium.org> Tested-by: Kevin Lin <kevinptt@chromium.org> Commit-Queue: Nathan Muggli <nmuggli@google.com>
diff --git a/ip_address.cc b/ip_address.cc index 4da9ed1..25ef913 100644 --- a/ip_address.cc +++ b/ip_address.cc
@@ -15,7 +15,6 @@ #include "base/check_op.h" #include "base/notreached.h" -#include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" @@ -108,7 +107,7 @@ } bool IPAddressBytes::operator==(const IPAddressBytes& other) const { - return base::ranges::equal(*this, other); + return std::ranges::equal(*this, other); } bool IPAddressBytes::operator!=(const IPAddressBytes& other) const {
diff --git a/libmetrics_metrics_tester.cc b/libmetrics_metrics_tester.cc index 5dbebf8..a030d44 100644 --- a/libmetrics_metrics_tester.cc +++ b/libmetrics_metrics_tester.cc
@@ -4,9 +4,9 @@ #include "redaction_tool/libmetrics_metrics_tester.h" +#include <algorithm> #include <string_view> -#include "base/ranges/algorithm.h" #include "redaction_tool/libmetrics_metrics_recorder.h" namespace redaction { @@ -17,7 +17,7 @@ size_t LibMetricsMetricsTester::GetBucketCount(std::string_view histogram_name, int histogram_value) { - return base::ranges::count( + return std::ranges::count( fake_metrics_library()->GetCalls(std::string(histogram_name)), histogram_value); }
diff --git a/redaction_tool_unittest.cc b/redaction_tool_unittest.cc index 4b8936f..4c45a24 100644 --- a/redaction_tool_unittest.cc +++ b/redaction_tool_unittest.cc
@@ -6,6 +6,7 @@ #include <gtest/gtest.h> +#include <algorithm> #include <set> #include <string_view> #include <utility> @@ -741,7 +742,7 @@ for (int enum_int = static_cast<int>(PIIType::kNone) + 1; enum_int <= static_cast<int>(PIIType::kMaxValue); ++enum_int) { const PIIType enum_value = static_cast<PIIType>(enum_int); - const size_t expected_count = base::ranges::count_if( + const size_t expected_count = std::ranges::count_if( kStringsWithRedactions, [enum_value](const StringWithRedaction& string_with_redaction) { return string_with_redaction.pii_type == enum_value;