[cleanup] Replace base::ranges with std::ranges: components/
Done entirely with `git grep` and `sed` + `git cl format`, no
hand-editing.
Bug: 386918226
Change-Id: I7377af2f9c3758c68a249b421d98bd3fd5c2c1fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6201377
Auto-Submit: Peter Kasting <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Commit-Queue: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1411730}
diff --git a/components/account_manager_core/account_manager_facade_impl_unittest.cc b/components/account_manager_core/account_manager_facade_impl_unittest.cc
index 578a595..419ab18 100644
--- a/components/account_manager_core/account_manager_facade_impl_unittest.cc
+++ b/components/account_manager_core/account_manager_facade_impl_unittest.cc
@@ -4,13 +4,13 @@
#include "components/account_manager_core/account_manager_facade_impl.h"
+#include <algorithm>
#include <limits>
#include <memory>
#include "base/functional/callback_forward.h"
#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/test/bind.h"
@@ -151,8 +151,8 @@
void GetAccounts(GetAccountsCallback callback) override {
std::vector<crosapi::mojom::AccountPtr> mojo_accounts;
- base::ranges::transform(accounts_, std::back_inserter(mojo_accounts),
- &ToMojoAccount);
+ std::ranges::transform(accounts_, std::back_inserter(mojo_accounts),
+ &ToMojoAccount);
std::move(callback).Run(std::move(mojo_accounts));
}
diff --git a/components/account_manager_core/chromeos/account_manager.cc b/components/account_manager_core/chromeos/account_manager.cc
index ab264bf..ade0f057 100644
--- a/components/account_manager_core/chromeos/account_manager.cc
+++ b/components/account_manager_core/chromeos/account_manager.cc
@@ -4,6 +4,7 @@
#include "components/account_manager_core/chromeos/account_manager.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include <string>
@@ -22,7 +23,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
@@ -823,8 +823,8 @@
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
auto it =
- base::ranges::find(pending_token_revocation_requests_, request,
- &std::unique_ptr<GaiaTokenRevocationRequest>::get);
+ std::ranges::find(pending_token_revocation_requests_, request,
+ &std::unique_ptr<GaiaTokenRevocationRequest>::get);
if (it != pending_token_revocation_requests_.end()) {
pending_token_revocation_requests_.erase(it);
diff --git a/components/affiliations/core/browser/affiliation_service_impl.cc b/components/affiliations/core/browser/affiliation_service_impl.cc
index 44f1d166..50c306e 100644
--- a/components/affiliations/core/browser/affiliation_service_impl.cc
+++ b/components/affiliations/core/browser/affiliation_service_impl.cc
@@ -4,6 +4,7 @@
#include "components/affiliations/core/browser/affiliation_service_impl.h"
+#include <algorithm>
#include <vector>
#include "base/containers/contains.h"
@@ -11,7 +12,6 @@
#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
#include "base/time/default_clock.h"
@@ -167,7 +167,7 @@
return it->second.change_password_url;
}
- if (base::ranges::any_of(pending_fetches_, [&uri](const auto& info) {
+ if (std::ranges::any_of(pending_fetches_, [&uri](const auto& info) {
return base::Contains(info.requested_facets, uri);
})) {
LogFetchResult(GetChangePasswordUrlMetric::kNotFetchedYet);
@@ -181,8 +181,8 @@
AffiliationFetcherInterface* fetcher,
std::unique_ptr<AffiliationFetcherDelegate::Result> result) {
auto processed_fetch =
- base::ranges::find(pending_fetches_, fetcher,
- [](const auto& info) { return info.fetcher.get(); });
+ std::ranges::find(pending_fetches_, fetcher,
+ [](const auto& info) { return info.fetcher.get(); });
if (processed_fetch == pending_fetches_.end())
return;
diff --git a/components/affiliations/core/browser/affiliation_utils.cc b/components/affiliations/core/browser/affiliation_utils.cc
index 5e98d43..3b26bf9 100644
--- a/components/affiliations/core/browser/affiliation_utils.cc
+++ b/components/affiliations/core/browser/affiliation_utils.cc
@@ -4,12 +4,12 @@
#include "components/affiliations/core/browser/affiliation_utils.h"
+#include <algorithm>
#include <map>
#include <ostream>
#include <string_view>
#include "base/base64.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -192,7 +192,7 @@
std::vector<FacetURI> ExtractAndSortFacetURIs(const AffiliatedFacets& facets) {
std::vector<FacetURI> uris;
uris.reserve(facets.size());
- base::ranges::transform(facets, std::back_inserter(uris), &Facet::uri);
+ std::ranges::transform(facets, std::back_inserter(uris), &Facet::uri);
std::sort(uris.begin(), uris.end());
return uris;
}
@@ -467,7 +467,7 @@
}
bool operator==(const GroupedFacets& lhs, const GroupedFacets& rhs) {
- if (!base::ranges::is_permutation(lhs.facets, rhs.facets)) {
+ if (!std::ranges::is_permutation(lhs.facets, rhs.facets)) {
return false;
}
return lhs.branding_info == rhs.branding_info;
diff --git a/components/affiliations/core/browser/fake_affiliation_api.cc b/components/affiliations/core/browser/fake_affiliation_api.cc
index dbf059d..d50b400 100644
--- a/components/affiliations/core/browser/fake_affiliation_api.cc
+++ b/components/affiliations/core/browser/fake_affiliation_api.cc
@@ -9,7 +9,6 @@
#include <tuple>
#include <utility>
-#include "base/ranges/algorithm.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace affiliations {
@@ -45,17 +44,17 @@
std::unique_ptr<AffiliationFetcherDelegate::Result> fake_response(
new AffiliationFetcherDelegate::Result);
for (const auto& facets : preset_equivalence_relation_) {
- bool had_intersection_with_request = base::ranges::any_of(
+ bool had_intersection_with_request = std::ranges::any_of(
fetcher->GetRequestedFacetURIs(), [&facets](const auto& uri) {
- return base::ranges::find(facets, uri, &Facet::uri) != facets.end();
+ return std::ranges::find(facets, uri, &Facet::uri) != facets.end();
});
if (had_intersection_with_request)
fake_response->affiliations.push_back(facets);
}
for (const auto& group : groups_) {
- bool had_intersection_with_request = base::ranges::any_of(
+ bool had_intersection_with_request = std::ranges::any_of(
fetcher->GetRequestedFacetURIs(), [&group](const auto& uri) {
- return base::ranges::find(group.facets, uri, &Facet::uri) !=
+ return std::ranges::find(group.facets, uri, &Facet::uri) !=
group.facets.end();
});
if (had_intersection_with_request)
diff --git a/components/affiliations/core/browser/sql_table_builder.cc b/components/affiliations/core/browser/sql_table_builder.cc
index a2ed6b8e..2bb0c3cd 100644
--- a/components/affiliations/core/browser/sql_table_builder.cc
+++ b/components/affiliations/core/browser/sql_table_builder.cc
@@ -4,6 +4,7 @@
#include "components/affiliations/core/browser/sql_table_builder.h"
+#include <algorithm>
#include <set>
#include <string_view>
#include <utility>
@@ -12,7 +13,6 @@
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -151,7 +151,7 @@
DCHECK(FindLastColumnByName(new_name) == columns_.rend());
// Check there is no index in the current version that references |old_name|.
- DCHECK(base::ranges::none_of(indices_, [&old_name](const Index& index) {
+ DCHECK(std::ranges::none_of(indices_, [&old_name](const Index& index) {
return index.max_version == kInvalidVersion &&
base::Contains(index.columns, old_name);
}));
@@ -187,7 +187,7 @@
auto column = FindLastColumnByName(name);
DCHECK(column != columns_.rend());
// Check there is no index in the current version that references |old_name|.
- DCHECK(base::ranges::none_of(indices_, [&name](const Index& index) {
+ DCHECK(std::ranges::none_of(indices_, [&name](const Index& index) {
return index.max_version == kInvalidVersion &&
base::Contains(index.columns, name);
}));
@@ -214,11 +214,11 @@
DCHECK(FindLastIndexByName(name) == indices_.rend());
// Check that all referenced columns are present in the last version by making
// sure that the inner predicate applies to all columns names in |columns|.
- DCHECK(base::ranges::all_of(columns, [this](const std::string& column_name) {
+ DCHECK(std::ranges::all_of(columns, [this](const std::string& column_name) {
// Check if there is any column with the required name which is also
// present in the latest version. Note that we don't require the last
// version to be sealed.
- return base::ranges::any_of(columns_, [&column_name](const Column& col) {
+ return std::ranges::any_of(columns_, [&column_name](const Column& col) {
return col.name == column_name && col.max_version == kInvalidVersion;
});
}));
@@ -271,7 +271,7 @@
std::string constraints = ComputeConstraints(sealed_version_);
DCHECK(!constraints.empty() ||
- base::ranges::any_of(columns_, &Column::is_primary_key));
+ std::ranges::any_of(columns_, &Column::is_primary_key));
std::string names; // Names and types of the current columns.
for (const Column& column : columns_) {
@@ -302,7 +302,7 @@
auto execute = [&db](const auto& sql) { return db->Execute(sql); };
sql::Transaction transaction(db);
return transaction.Begin() && execute(create_table_statement) &&
- base::ranges::all_of(create_index_sqls, execute) &&
+ std::ranges::all_of(create_index_sqls, execute) &&
transaction.Commit();
}
@@ -355,7 +355,7 @@
size_t SQLTableBuilder::NumberOfColumns() const {
DCHECK(IsVersionLastAndSealed(sealed_version_));
- return base::checked_cast<size_t>(base::ranges::count_if(
+ return base::checked_cast<size_t>(std::ranges::count_if(
columns_,
[this](const Column& column) { return IsColumnInLastVersion(column); }));
}
@@ -491,7 +491,7 @@
};
sql::Transaction transaction(db);
if (!(transaction.Begin() &&
- base::ranges::all_of(names_of_new_columns_list, add_column) &&
+ std::ranges::all_of(names_of_new_columns_list, add_column) &&
transaction.Commit())) {
return false;
}
@@ -532,12 +532,12 @@
std::vector<SQLTableBuilder::Column>::reverse_iterator
SQLTableBuilder::FindLastColumnByName(const std::string& name) {
- return base::ranges::find(base::Reversed(columns_), name, &Column::name);
+ return std::ranges::find(base::Reversed(columns_), name, &Column::name);
}
std::vector<SQLTableBuilder::Index>::reverse_iterator
SQLTableBuilder::FindLastIndexByName(const std::string& name) {
- return base::ranges::find(base::Reversed(indices_), name, &Index::name);
+ return std::ranges::find(base::Reversed(indices_), name, &Index::name);
}
bool SQLTableBuilder::IsVersionLastAndSealed(unsigned version) const {
@@ -549,8 +549,8 @@
column_or_index.max_version != sealed_version_;
};
return sealed_version_ == version &&
- base::ranges::all_of(columns_, is_last_sealed) &&
- base::ranges::all_of(indices_, is_last_sealed);
+ std::ranges::all_of(columns_, is_last_sealed) &&
+ std::ranges::all_of(indices_, is_last_sealed);
}
bool SQLTableBuilder::IsColumnInLastVersion(const Column& column) const {
diff --git a/components/aggregation_service/aggregation_coordinator_utils.cc b/components/aggregation_service/aggregation_coordinator_utils.cc
index 75a362a7..a4cd26b 100644
--- a/components/aggregation_service/aggregation_coordinator_utils.cc
+++ b/components/aggregation_service/aggregation_coordinator_utils.cc
@@ -4,6 +4,7 @@
#include "components/aggregation_service/aggregation_coordinator_utils.h"
+#include <algorithm>
#include <string_view>
#include <utility>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/check.h"
#include "base/containers/contains.h"
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "components/aggregation_service/features.h"
#include "components/attribution_reporting/is_origin_suitable.h"
@@ -82,8 +82,8 @@
if (origins_.empty()) {
return false;
}
- return base::ranges::all_of(origins_,
- &attribution_reporting::IsOriginSuitable);
+ return std::ranges::all_of(origins_,
+ &attribution_reporting::IsOriginSuitable);
}
private:
diff --git a/components/allocation_recorder/crash_handler/payload_unittests.cc b/components/allocation_recorder/crash_handler/payload_unittests.cc
index 37de76b..2a71d64 100644
--- a/components/allocation_recorder/crash_handler/payload_unittests.cc
+++ b/components/allocation_recorder/crash_handler/payload_unittests.cc
@@ -4,12 +4,13 @@
#include "components/allocation_recorder/crash_handler/payload.h"
+#include <algorithm>
+
#include "base/allocator/dispatcher/notification_data.h"
#include "base/allocator/dispatcher/subsystem.h"
#include "base/bits.h"
#include "base/containers/span.h"
#include "base/debug/allocation_trace.h"
-#include "base/ranges/algorithm.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::allocator::dispatcher::AllocationNotificationData;
@@ -73,7 +74,7 @@
const auto& report_frames = report_entry.stack_trace().frames();
std::vector<const void*> converted_frames;
- base::ranges::transform(
+ std::ranges::transform(
report_frames, std::back_inserter(converted_frames),
[](const allocation_recorder::StackFrame& frame) {
return reinterpret_cast<const void*>(frame.address());
diff --git a/components/allocation_recorder/testing/crash_verification.cc b/components/allocation_recorder/testing/crash_verification.cc
index e1c96fb8..352a744 100644
--- a/components/allocation_recorder/testing/crash_verification.cc
+++ b/components/allocation_recorder/testing/crash_verification.cc
@@ -15,7 +15,6 @@
#include "base/debug/debugging_buildflags.h"
#include "base/files/file_path.h"
#include "base/functional/callback.h"
-#include "base/ranges/algorithm.h"
#include "base/threading/platform_thread.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/components/android_autofill/browser/form_field_data_android_bridge_impl.cc b/components/android_autofill/browser/form_field_data_android_bridge_impl.cc
index a4b8a8a..7862459 100644
--- a/components/android_autofill/browser/form_field_data_android_bridge_impl.cc
+++ b/components/android_autofill/browser/form_field_data_android_bridge_impl.cc
@@ -65,8 +65,8 @@
const auto& projection) {
std::vector<std::u16string> projected_options;
projected_options.reserve(options.size());
- base::ranges::transform(options, std::back_inserter(projected_options),
- projection);
+ std::ranges::transform(options, std::back_inserter(projected_options),
+ projection);
return ToJavaArrayOfStrings(env, projected_options);
};
diff --git a/components/android_autofill/browser/test_support/autofill_provider_test_helper.cc b/components/android_autofill/browser/test_support/autofill_provider_test_helper.cc
index 53d9f66a..11c9005 100644
--- a/components/android_autofill/browser/test_support/autofill_provider_test_helper.cc
+++ b/components/android_autofill/browser/test_support/autofill_provider_test_helper.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
#include <iterator>
#include <string>
#include "base/android/jni_array.h"
#include "base/base64.h"
-#include "base/ranges/algorithm.h"
#include "components/android_autofill/browser/autofill_provider.h"
#include "components/autofill/content/browser/content_autofill_driver.h"
#include "components/autofill/content/browser/content_autofill_driver_factory.h"
@@ -135,7 +135,7 @@
if (form_field_data.id_attribute() == field_ids[i]) {
std::vector<FieldType> field_types;
field_types.reserve(raw_field_types[i].size());
- base::ranges::transform(
+ std::ranges::transform(
raw_field_types[i], std::back_inserter(field_types),
[](int type) -> FieldType { return FieldType(type); });
autofill::test::AddFieldPredictionsToForm(
diff --git a/components/app_restore/arc_read_handler.cc b/components/app_restore/arc_read_handler.cc
index a45bbc8..51a412f 100644
--- a/components/app_restore/arc_read_handler.cc
+++ b/components/app_restore/arc_read_handler.cc
@@ -4,10 +4,10 @@
#include "components/app_restore/arc_read_handler.h"
+#include <algorithm>
#include <memory>
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "components/app_restore/app_launch_info.h"
#include "components/app_restore/app_restore_info.h"
#include "components/app_restore/app_restore_utils.h"
@@ -191,7 +191,7 @@
void ArcReadHandler::UpdateWindowCandidates(int32_t task_id,
int32_t restore_window_id) {
// Go through `arc_window_candidates_`.
- auto window_it = base::ranges::find(
+ auto window_it = std::ranges::find(
arc_window_candidates_, task_id,
[](aura::Window* window) { return window->GetProperty(kWindowIdKey); });
if (window_it == arc_window_candidates_.end())
diff --git a/components/app_restore/arc_save_handler.cc b/components/app_restore/arc_save_handler.cc
index b75b1b2d..5c97da22 100644
--- a/components/app_restore/arc_save_handler.cc
+++ b/components/app_restore/arc_save_handler.cc
@@ -4,8 +4,9 @@
#include "components/app_restore/arc_save_handler.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "components/app_restore/app_launch_info.h"
#include "components/app_restore/app_restore_info.h"
#include "components/app_restore/app_restore_utils.h"
@@ -47,7 +48,7 @@
// Go through `arc_window_candidates_`. If the window for `session_id` has
// been created, call OnAppLaunched to save the window info.
- auto window_it = base::ranges::find(
+ auto window_it = std::ranges::find(
arc_window_candidates_, session_id, [](aura::Window* window) {
return window->GetProperty(app_restore::kGhostWindowSessionIdKey);
});
@@ -193,7 +194,7 @@
// Go through |arc_window_candidates_|. If the window for |task_id| has been
// created, call OnAppLaunched to save the window info.
- auto window_it = base::ranges::find(
+ auto window_it = std::ranges::find(
arc_window_candidates_, task_id, [](aura::Window* window) {
return window->GetProperty(app_restore::kWindowIdKey);
});
diff --git a/components/app_restore/restore_data.cc b/components/app_restore/restore_data.cc
index 1c625d0..115178ba 100644
--- a/components/app_restore/restore_data.cc
+++ b/components/app_restore/restore_data.cc
@@ -139,7 +139,7 @@
if (it == app_id_to_launch_list_.end())
return false;
- return base::ranges::any_of(
+ return std::ranges::any_of(
it->second,
[](const std::pair<const int, std::unique_ptr<AppRestoreData>>& data) {
return data.second->browser_extra_info.app_type_browser.value_or(false);
@@ -151,7 +151,7 @@
if (it == app_id_to_launch_list_.end())
return false;
- return base::ranges::any_of(
+ return std::ranges::any_of(
it->second,
[](const std::pair<const int, std::unique_ptr<AppRestoreData>>& data) {
return !data.second->browser_extra_info.app_type_browser.value_or(
diff --git a/components/attribution_reporting/aggregatable_debug_reporting_config.cc b/components/attribution_reporting/aggregatable_debug_reporting_config.cc
index 12f295f..9def5cf7 100644
--- a/components/attribution_reporting/aggregatable_debug_reporting_config.cc
+++ b/components/attribution_reporting/aggregatable_debug_reporting_config.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <algorithm>
#include <optional>
#include <set>
#include <string>
@@ -18,7 +19,6 @@
#include "base/functional/function_ref.h"
#include "base/metrics/histogram_functions.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "base/values.h"
@@ -218,7 +218,7 @@
return false;
}
- return base::ranges::all_of(data, [&](const auto& p) {
+ return std::ranges::all_of(data, [&](const auto& p) {
return IsValueInRange(p.second.value(), budget);
});
}
diff --git a/components/attribution_reporting/aggregatable_named_budget_defs.cc b/components/attribution_reporting/aggregatable_named_budget_defs.cc
index 90dbf740..3dfb56b 100644
--- a/components/attribution_reporting/aggregatable_named_budget_defs.cc
+++ b/components/attribution_reporting/aggregatable_named_budget_defs.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <algorithm>
#include <optional>
#include <string>
#include <utility>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "base/values.h"
@@ -32,7 +32,7 @@
bool IsValid(const AggregatableNamedBudgetDefs::BudgetMap& budgets) {
return budgets.size() <= kMaxAggregatableNamedBudgetsPerSource &&
- base::ranges::all_of(budgets, [](const auto& budget) {
+ std::ranges::all_of(budgets, [](const auto& budget) {
return AggregatableNamedBudgetKeyHasValidLength(budget.first) &&
IsAggregatableBudgetInRange(budget.second);
});
diff --git a/components/attribution_reporting/aggregatable_values.cc b/components/attribution_reporting/aggregatable_values.cc
index c86677e3..0ae331a 100644
--- a/components/attribution_reporting/aggregatable_values.cc
+++ b/components/attribution_reporting/aggregatable_values.cc
@@ -6,13 +6,13 @@
#include <stdint.h>
+#include <algorithm>
#include <optional>
#include <utility>
#include "base/check.h"
#include "base/containers/flat_tree.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "base/values.h"
@@ -29,7 +29,7 @@
using ::attribution_reporting::mojom::TriggerRegistrationError;
bool IsValid(const AggregatableValues::Values& values) {
- return base::ranges::all_of(values, [](const auto& value) {
+ return std::ranges::all_of(values, [](const auto& value) {
return IsAggregatableValueInRange(value.second.value());
});
}
diff --git a/components/attribution_reporting/aggregation_keys.cc b/components/attribution_reporting/aggregation_keys.cc
index 2faced0..f837ea4 100644
--- a/components/attribution_reporting/aggregation_keys.cc
+++ b/components/attribution_reporting/aggregation_keys.cc
@@ -4,6 +4,7 @@
#include "components/attribution_reporting/aggregation_keys.h"
+#include <algorithm>
#include <optional>
#include <string>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/check.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "base/values.h"
@@ -32,7 +32,7 @@
bool IsValid(const AggregationKeys::Keys& keys) {
return keys.size() <= kMaxAggregationKeysPerSource &&
- base::ranges::all_of(keys, [](const auto& key) {
+ std::ranges::all_of(keys, [](const auto& key) {
return AggregationKeyIdHasValidLength(key.first);
});
}
diff --git a/components/attribution_reporting/attribution_scopes_set.cc b/components/attribution_reporting/attribution_scopes_set.cc
index bef42c6..9176a61 100644
--- a/components/attribution_reporting/attribution_scopes_set.cc
+++ b/components/attribution_reporting/attribution_scopes_set.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <limits>
#include <optional>
#include <string>
@@ -16,7 +17,6 @@
#include "base/check_op.h"
#include "base/containers/flat_set.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "base/values.h"
@@ -164,7 +164,7 @@
CHECK_GT(scope_limit, 0u);
return scopes_.size() <=
std::min(kMaxScopesPerSource, static_cast<size_t>(scope_limit)) &&
- base::ranges::all_of(scopes_, [](const std::string& scope) {
+ std::ranges::all_of(scopes_, [](const std::string& scope) {
return scope.length() <= kMaxLengthPerAttributionScope;
});
}
diff --git a/components/attribution_reporting/destination_set.cc b/components/attribution_reporting/destination_set.cc
index ab2b75b..3fb81b0 100644
--- a/components/attribution_reporting/destination_set.cc
+++ b/components/attribution_reporting/destination_set.cc
@@ -12,7 +12,6 @@
#include "base/check.h"
#include "base/containers/flat_set.h"
#include "base/functional/overloaded.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "base/values.h"
@@ -30,7 +29,7 @@
bool DestinationsValid(const DestinationSet::Destinations& destinations) {
return !destinations.empty() && destinations.size() <= kMaxDestinations &&
- base::ranges::all_of(destinations, &IsSitePotentiallySuitable);
+ std::ranges::all_of(destinations, &IsSitePotentiallySuitable);
}
} // namespace
diff --git a/components/attribution_reporting/event_report_windows.cc b/components/attribution_reporting/event_report_windows.cc
index 4f4a203b..7465a0e 100644
--- a/components/attribution_reporting/event_report_windows.cc
+++ b/components/attribution_reporting/event_report_windows.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <functional>
#include <iterator>
#include <optional>
@@ -16,7 +17,6 @@
#include "base/check_op.h"
#include "base/containers/flat_set.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
@@ -46,7 +46,7 @@
}
bool IsStrictlyIncreasing(const std::vector<base::TimeDelta>& end_times) {
- return base::ranges::adjacent_find(end_times, std::not_fn(std::less{})) ==
+ return std::ranges::adjacent_find(end_times, std::not_fn(std::less{})) ==
end_times.end();
}
diff --git a/components/attribution_reporting/filters.cc b/components/attribution_reporting/filters.cc
index 66b82ba..85c5fc8 100644
--- a/components/attribution_reporting/filters.cc
+++ b/components/attribution_reporting/filters.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <limits>
#include <optional>
#include <string>
@@ -18,7 +19,6 @@
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "base/types/expected.h"
@@ -265,7 +265,7 @@
// If the filters are negated, the behavior should be that every single filter
// key does not match between the two (negating the function result is not
// sufficient by the API definition).
- return base::ranges::any_of(filters, [&](const FilterConfig& config) {
+ return std::ranges::any_of(filters, [&](const FilterConfig& config) {
if (config.lookback_window()) {
if (duration_since_source_registration >
config.lookback_window().value()) {
@@ -277,10 +277,10 @@
}
}
- return base::ranges::all_of(
+ return std::ranges::all_of(
config.filter_values(), [&](const auto& trigger_filter) {
if (trigger_filter.first == kSourceTypeFilterKey) {
- bool has_intersection = base::ranges::any_of(
+ bool has_intersection = std::ranges::any_of(
trigger_filter.second, [&](const std::string& value) {
return value == SourceTypeName(source_type);
});
@@ -302,7 +302,7 @@
return negated != source_filter->second.empty();
}
- bool has_intersection = base::ranges::any_of(
+ bool has_intersection = std::ranges::any_of(
trigger_filter.second, [&](const std::string& value) {
return base::Contains(source_filter->second, value);
});
diff --git a/components/attribution_reporting/parsing_utils.cc b/components/attribution_reporting/parsing_utils.cc
index 1c2c6772..b1ef942 100644
--- a/components/attribution_reporting/parsing_utils.cc
+++ b/components/attribution_reporting/parsing_utils.cc
@@ -20,7 +20,6 @@
#include "base/containers/flat_set.h"
#include "base/containers/flat_tree.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/abseil_string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/components/attribution_reporting/privacy_math.cc b/components/attribution_reporting/privacy_math.cc
index 6d00aa7..0c9b0bc1 100644
--- a/components/attribution_reporting/privacy_math.cc
+++ b/components/attribution_reporting/privacy_math.cc
@@ -24,7 +24,6 @@
#include "base/numerics/clamped_math.h"
#include "base/numerics/safe_conversions.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
#include "components/attribution_reporting/attribution_scopes_data.h"
@@ -314,8 +313,8 @@
return base::MakeStrictNum(response->size()) <=
static_cast<int>(specs.max_event_level_reports()) &&
- base::ranges::all_of(*response, [&](const FakeEventLevelReport&
- report) {
+ std::ranges::all_of(*response, [&](const FakeEventLevelReport&
+ report) {
const auto spec = specs.find(report.trigger_data,
mojom::TriggerDataMatching::kExact);
return spec != specs.end() && report.window_index >= 0 &&
diff --git a/components/attribution_reporting/test_utils.cc b/components/attribution_reporting/test_utils.cc
index bcfc936..547d694 100644
--- a/components/attribution_reporting/test_utils.cc
+++ b/components/attribution_reporting/test_utils.cc
@@ -4,13 +4,13 @@
#include "components/attribution_reporting/test_utils.h"
+#include <algorithm>
#include <optional>
#include <ostream>
#include <string>
#include <utility>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/values.h"
#include "components/attribution_reporting/aggregatable_debug_reporting_config.h"
@@ -65,7 +65,7 @@
attribution_reporting::TriggerSpecs::TriggerDataIndices indices;
std::vector<attribution_reporting::TriggerSpec> raw_specs;
- bool supportable_by_single_spec = base::ranges::all_of(
+ bool supportable_by_single_spec = std::ranges::all_of(
windows_per_type, [&](int w) { return w == windows_per_type[0]; });
if (collapse_into_single_spec && supportable_by_single_spec) {
diff --git a/components/attribution_reporting/trigger_config.cc b/components/attribution_reporting/trigger_config.cc
index d1fc1e4..f22941c 100644
--- a/components/attribution_reporting/trigger_config.cc
+++ b/components/attribution_reporting/trigger_config.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <algorithm>
#include <optional>
#include <string>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/check.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_tree.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
@@ -84,7 +84,7 @@
bool AreSpecsValid(const TriggerSpecs::TriggerDataIndices& trigger_data_indices,
const std::vector<TriggerSpec>& specs) {
return trigger_data_indices.size() <= kMaxTriggerDataPerSource &&
- base::ranges::all_of(trigger_data_indices, [&specs](const auto& pair) {
+ std::ranges::all_of(trigger_data_indices, [&specs](const auto& pair) {
return pair.second < specs.size();
});
}
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 6bc09b5..c8cea3f0 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <cstdint>
#include <functional>
#include <memory>
@@ -25,7 +26,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -1045,7 +1045,7 @@
auto host_form_is_connected = [](const FormFieldData::FillData& fill_data) {
return !form_util::GetFormByRendererId(fill_data.host_form_id).IsNull();
};
- if (auto it = base::ranges::find_if(fields, host_form_is_connected);
+ if (auto it = std::ranges::find_if(fields, host_form_is_connected);
it != fields.end()) {
base::FeatureList::IsEnabled(
features::kAutofillAcceptDomMutationAfterAutofillSubmission)
@@ -1937,8 +1937,8 @@
std::vector<FormFieldData> fields =
provisionally_saved_form()->ExtractFields();
if (auto it =
- base::ranges::find(fields, form_util::GetFieldRendererId(element),
- &FormFieldData::renderer_id);
+ std::ranges::find(fields, form_util::GetFieldRendererId(element),
+ &FormFieldData::renderer_id);
it != fields.end()) {
it->set_value(element.Value().Utf16());
it->set_is_autofilled(element.IsAutofilled());
diff --git a/components/autofill/content/renderer/form_autofill_issues.cc b/components/autofill/content/renderer/form_autofill_issues.cc
index 2ffbee77..8586895c 100644
--- a/components/autofill/content/renderer/form_autofill_issues.cc
+++ b/components/autofill/content/renderer/form_autofill_issues.cc
@@ -4,11 +4,11 @@
#include "components/autofill/content/renderer/form_autofill_issues.h"
+#include <algorithm>
#include <string_view>
#include <vector>
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "components/autofill/content/renderer/form_autofill_util.h"
#include "components/autofill/core/common/autofill_features.h"
@@ -125,15 +125,15 @@
elements_with_id_attr.push_back(element);
}
}
- base::ranges::sort(elements_with_id_attr, [](const WebFormControlElement& a,
- const WebFormControlElement& b) {
+ std::ranges::sort(elements_with_id_attr, [](const WebFormControlElement& a,
+ const WebFormControlElement& b) {
return std::forward_as_tuple(a.GetIdAttribute(),
GetShadowHostDOMNodeId(a)) <
std::forward_as_tuple(b.GetIdAttribute(), GetShadowHostDOMNodeId(b));
});
for (auto it = elements_with_id_attr.begin();
- (it = base::ranges::adjacent_find(
+ (it = std::ranges::adjacent_find(
it, elements_with_id_attr.end(),
[](const WebFormControlElement& a, const WebFormControlElement& b) {
return a.GetIdAttribute() == b.GetIdAttribute() &&
diff --git a/components/autofill/content/renderer/form_autofill_issues_browsertest.cc b/components/autofill/content/renderer/form_autofill_issues_browsertest.cc
index ad366a6..411b956 100644
--- a/components/autofill/content/renderer/form_autofill_issues_browsertest.cc
+++ b/components/autofill/content/renderer/form_autofill_issues_browsertest.cc
@@ -89,7 +89,7 @@
GetFormIssuesForTesting(form_target.GetFormControlElements(), {});
int duplicated_ids_issue_count =
- base::ranges::count_if(form_issues, [](const FormIssue& form_issue) {
+ std::ranges::count_if(form_issues, [](const FormIssue& form_issue) {
return form_issue.issue_type ==
GenericIssueErrorType::kFormDuplicateIdForInputError &&
form_issue.violating_node_attribute.Utf8() == "id";
diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc
index dce05f8..6f4ef14 100644
--- a/components/autofill/content/renderer/form_autofill_util.cc
+++ b/components/autofill/content/renderer/form_autofill_util.cc
@@ -32,7 +32,6 @@
#include "base/not_fatal_until.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
@@ -543,7 +542,7 @@
if (attribute.IsNull())
return false;
std::string value = attribute.Utf8();
- base::ranges::transform(value, value.begin(), ::tolower);
+ std::ranges::transform(value, value.begin(), ::tolower);
for (const char* const button_feature : kButtonFeatures) {
if (value.find(button_feature, 0) != std::string::npos)
return true;
@@ -1402,15 +1401,15 @@
return nullptr;
auto get_field_name = [](const auto& p) { return p.first->name(); };
- auto it = base::ranges::find(fields, field_name, get_field_name);
+ auto it = std::ranges::find(fields, field_name, get_field_name);
auto end = fields.end();
if (it == end ||
- base::ranges::find(it + 1, end, field_name, get_field_name) != end) {
+ std::ranges::find(it + 1, end, field_name, get_field_name) != end) {
auto ShadowHostHasTargetName = [&](const auto& p) {
return base::Contains(p.second.shadow_host_name_attributes, field_name) ||
base::Contains(p.second.shadow_host_id_attributes, field_name);
};
- it = base::ranges::find_if(fields, ShadowHostHasTargetName);
+ it = std::ranges::find_if(fields, ShadowHostHasTargetName);
if (it != end) {
label_source =
base::Contains(it->second.shadow_host_name_attributes, field_name)
@@ -2411,8 +2410,8 @@
form->set_fields({std::move(field)});
}
- if (auto it = base::ranges::find(form->fields(), GetFieldRendererId(element),
- &FormFieldData::renderer_id);
+ if (auto it = std::ranges::find(form->fields(), GetFieldRendererId(element),
+ &FormFieldData::renderer_id);
it != form->fields().end()) {
return std::make_optional(std::make_pair(std::move(*form), raw_ref(*it)));
}
@@ -2767,12 +2766,12 @@
std::vector<WebFormControlElement> form_control_elements;
for (const WebFormElement& form : document.GetTopLevelForms()) {
- base::ranges::move(GetOwnedFormControls(document, form),
- std::back_inserter(form_control_elements));
+ std::ranges::move(GetOwnedFormControls(document, form),
+ std::back_inserter(form_control_elements));
}
- base::ranges::move(GetOwnedFormControls(document, WebFormElement()),
- std::back_inserter(form_control_elements));
+ std::ranges::move(GetOwnedFormControls(document, WebFormElement()),
+ std::back_inserter(form_control_elements));
auto extract_four_digit_combinations = [&](WebNode node) {
if (!node.IsTextNode()) {
diff --git a/components/autofill/content/renderer/form_cache_browsertest.cc b/components/autofill/content/renderer/form_cache_browsertest.cc
index 3bf3f10..304e46e 100644
--- a/components/autofill/content/renderer/form_cache_browsertest.cc
+++ b/components/autofill/content/renderer/form_cache_browsertest.cc
@@ -4,12 +4,12 @@
#include "components/autofill/content/renderer/form_cache.h"
+#include <algorithm>
#include <optional>
#include <string_view>
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
diff --git a/components/autofill/content/renderer/page_passwords_analyser.cc b/components/autofill/content/renderer/page_passwords_analyser.cc
index 3500019c..7fa6835a 100644
--- a/components/autofill/content/renderer/page_passwords_analyser.cc
+++ b/components/autofill/content/renderer/page_passwords_analyser.cc
@@ -4,6 +4,7 @@
#include "components/autofill/content/renderer/page_passwords_analyser.h"
+#include <algorithm>
#include <map>
#include <stack>
#include <string>
@@ -12,7 +13,6 @@
#include "base/containers/contains.h"
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -301,7 +301,7 @@
WebElement control(label.CorrespondingControl());
if (control && control.IsFormControlElement()) {
WebFormControlElement form_control(control.To<WebFormControlElement>());
- auto found = base::ranges::find(inputs, form_control);
+ auto found = std::ranges::find(inputs, form_control);
if (found != inputs.end()) {
std::string label_content(
base::UTF16ToUTF8(form_util::FindChildText(label)));
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
index 56ce7d6..afaeca85 100644
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <iterator>
#include <memory>
#include <optional>
@@ -26,7 +27,6 @@
#include "base/no_destructor.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -370,7 +370,7 @@
form_util::GetOwnedAutofillableFormControls(
frame->GetDocument(), password_element.GetOwningFormForAutofill());
- auto iter = base::ranges::find(elements, password_element);
+ auto iter = std::ranges::find(elements, password_element);
if (iter == elements.end())
return WebInputElement();
diff --git a/components/autofill/content/renderer/password_generation_agent.cc b/components/autofill/content/renderer/password_generation_agent.cc
index a979e062..ed0efd3 100644
--- a/components/autofill/content/renderer/password_generation_agent.cc
+++ b/components/autofill/content/renderer/password_generation_agent.cc
@@ -4,6 +4,7 @@
#include "components/autofill/content/renderer/password_generation_agent.h"
+#include <algorithm>
#include <memory>
#include <utility>
@@ -13,7 +14,6 @@
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "components/autofill/content/renderer/form_autofill_util.h"
#include "components/autofill/content/renderer/password_autofill_agent.h"
@@ -60,7 +60,7 @@
FieldRendererId FindConfirmationPasswordFieldId(
const std::vector<WebFormControlElement>& control_elements,
const WebFormControlElement& new_password) {
- auto iter = base::ranges::find(control_elements, new_password);
+ auto iter = std::ranges::find(control_elements, new_password);
if (iter == control_elements.end())
return FieldRendererId();
diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 22995b7..b1ff420 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include <algorithm>
#include <map>
#include <memory>
#include <vector>
@@ -13,7 +14,6 @@
#include "base/files/file_path.h"
#include "base/no_destructor.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -264,11 +264,11 @@
// To ensure a consistent order with the output files, sort the profiles by
// modification date. This corresponds to the order in which the profiles
// were imported (or updated).
- base::ranges::sort(imported_profiles,
- [](const AutofillProfile* a, const AutofillProfile* b) {
- return a->usage_history().modification_date() <
- b->usage_history().modification_date();
- });
+ std::ranges::sort(imported_profiles,
+ [](const AutofillProfile* a, const AutofillProfile* b) {
+ return a->usage_history().modification_date() <
+ b->usage_history().modification_date();
+ });
*merged_profiles = SerializeProfiles(imported_profiles);
}
diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_encoding.cc b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_encoding.cc
index 23672e1..c49875901 100644
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_encoding.cc
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_encoding.cc
@@ -14,7 +14,6 @@
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/types/optional_ref.h"
@@ -89,8 +88,8 @@
}
}
// At most one override source is non-empty - preserve the values.
- base::ranges::move(manual_overrides, std::back_inserter(result));
- base::ranges::move(server_overrides, std::back_inserter(result));
+ std::ranges::move(manual_overrides, std::back_inserter(result));
+ std::ranges::move(server_overrides, std::back_inserter(result));
return result;
}
@@ -646,8 +645,8 @@
}
std::vector<AutofillField*> upload_fields(form.fields().size());
- base::ranges::transform(form.fields(), upload_fields.begin(),
- &std::unique_ptr<AutofillField>::get);
+ std::ranges::transform(form.fields(), upload_fields.begin(),
+ &std::unique_ptr<AutofillField>::get);
EncodeFormFieldsForUpload(form, upload_fields, &upload);
std::vector<AutofillUploadContents> uploads = {std::move(upload)};
@@ -660,8 +659,8 @@
field->host_form_signature() == form.form_signature();
});
// Partition `upload_fields` with respect to the forms' renderer id.
- base::ranges::stable_sort(upload_fields, /*comp=*/{},
- &FormFieldData::renderer_form_id);
+ std::ranges::stable_sort(upload_fields, /*comp=*/{},
+ &FormFieldData::renderer_form_id);
for (auto subform_begin = upload_fields.begin();
subform_begin != upload_fields.end();) {
diff --git a/components/autofill/core/browser/crowdsourcing/disambiguate_possible_field_types_unittest.cc b/components/autofill/core/browser/crowdsourcing/disambiguate_possible_field_types_unittest.cc
index 3fea2da7..8cc149db 100644
--- a/components/autofill/core/browser/crowdsourcing/disambiguate_possible_field_types_unittest.cc
+++ b/components/autofill/core/browser/crowdsourcing/disambiguate_possible_field_types_unittest.cc
@@ -4,7 +4,8 @@
#include "components/autofill/core/browser/crowdsourcing/disambiguate_possible_field_types.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/autofill/core/browser/autofill_field.h"
#include "components/autofill/core/browser/test_utils/autofill_test_utils.h"
#include "components/autofill/core/common/autofill_features.h"
@@ -56,7 +57,7 @@
DisambiguatePossibleFieldTypes(form_structure);
std::vector<FieldTypeSet> disambiguated_possible_field_types;
- base::ranges::transform(
+ std::ranges::transform(
form_structure.fields(),
std::back_inserter(disambiguated_possible_field_types),
[](const std::unique_ptr<AutofillField>& field) {
diff --git a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc b/components/autofill/core/browser/crowdsourcing/votes_uploader.cc
index 3dc7a2b1..e0248b11 100644
--- a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc
+++ b/components/autofill/core/browser/crowdsourcing/votes_uploader.cc
@@ -310,7 +310,7 @@
const std::u16string& last_unlocked_credit_card_cvc,
ukm::SourceId ukm_source_id) {
auto count_types = [&submitted_form](FormType type) {
- return base::ranges::count_if(
+ return std::ranges::count_if(
submitted_form->fields(),
[=](const std::unique_ptr<AutofillField>& field) {
return FieldTypeGroupToFormType(field->Type().group()) == type;
diff --git a/components/autofill/core/browser/data_manager/addresses/address_data_cleaner.cc b/components/autofill/core/browser/data_manager/addresses/address_data_cleaner.cc
index f29e170..2f036008 100644
--- a/components/autofill/core/browser/data_manager/addresses/address_data_cleaner.cc
+++ b/components/autofill/core/browser/data_manager/addresses/address_data_cleaner.cc
@@ -4,9 +4,10 @@
#include "components/autofill/core/browser/data_manager/addresses/address_data_cleaner.h"
+#include <algorithm>
+
#include "base/containers/to_vector.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/data_manager/addresses/address_data_manager.h"
#include "components/autofill/core/browser/data_manager/personal_data_manager.h"
#include "components/autofill/core/browser/data_model/autofill_profile.h"
@@ -74,7 +75,7 @@
local_profile_it != account_profiles.begin(); ++local_profile_it) {
// If possible, merge `*local_profile_it` with another local profile and
// remove it.
- if (auto merge_candidate = base::ranges::find_if(
+ if (auto merge_candidate = std::ranges::find_if(
local_profile_it + 1, account_profiles.begin(),
[&](const AutofillProfile& local_profile2) {
return comparator.AreMergeable(*local_profile_it, local_profile2);
@@ -89,7 +90,7 @@
}
// `*local_profile_it` is not mergeable with another local profile. But it
// might be a subset of an account profile and can thus be removed.
- if (auto superset_account_profile = base::ranges::find_if(
+ if (auto superset_account_profile = std::ranges::find_if(
account_profiles,
[&](const AutofillProfile& account_profile) {
return comparator.AreMergeable(*local_profile_it,
diff --git a/components/autofill/core/browser/data_manager/addresses/address_data_manager.cc b/components/autofill/core/browser/data_manager/addresses/address_data_manager.cc
index 38d0f8a..9fcf7a6b 100644
--- a/components/autofill/core/browser/data_manager/addresses/address_data_manager.cc
+++ b/components/autofill/core/browser/data_manager/addresses/address_data_manager.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/data_manager/addresses/address_data_manager.h"
+#include <algorithm>
#include <iterator>
#include <memory>
@@ -15,7 +16,6 @@
#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
#include "components/autofill/core/browser/country_type.h"
@@ -54,22 +54,22 @@
case AddressDataManager::ProfileOrder::kNone:
break;
case AddressDataManager::ProfileOrder::kHighestFrecencyDesc:
- base::ranges::sort(
+ std::ranges::sort(
profiles, [comparison_time = AutofillClock::Now()](
const AutofillProfile* a, const AutofillProfile* b) {
return a->HasGreaterRankingThan(b, comparison_time);
});
break;
case AddressDataManager::ProfileOrder::kMostRecentlyModifiedDesc:
- base::ranges::sort(
+ std::ranges::sort(
profiles, [](const AutofillProfile* a, const AutofillProfile* b) {
return a->usage_history().modification_date() >
b->usage_history().modification_date();
});
break;
case AddressDataManager::ProfileOrder::kMostRecentlyUsedFirstDesc:
- base::ranges::sort(profiles, [](const AutofillProfile* a,
- const AutofillProfile* b) {
+ std::ranges::sort(profiles, [](const AutofillProfile* a,
+ const AutofillProfile* b) {
return a->usage_history().use_date() > b->usage_history().use_date();
});
break;
@@ -216,7 +216,7 @@
const AutofillProfile* AddressDataManager::GetProfileByGUID(
const std::string& guid) const {
std::vector<const AutofillProfile*> profiles = GetProfiles();
- auto it = base::ranges::find(
+ auto it = std::ranges::find(
profiles, guid,
[](const AutofillProfile* profile) { return profile->guid(); });
return it != profiles.end() ? *it : nullptr;
@@ -256,7 +256,7 @@
// Duplicates can exist across record types.
const std::vector<const AutofillProfile*> profiles =
GetProfilesByRecordType(profile.record_type());
- auto duplicate_profile_iter = base::ranges::find_if(
+ auto duplicate_profile_iter = std::ranges::find_if(
profiles, [&profile](const AutofillProfile* other_profile) {
return profile.guid() != other_profile->guid() &&
other_profile->Compare(profile) == 0;
@@ -684,15 +684,15 @@
case AutofillProfileChange::UPDATE:
if (existing_profile &&
!existing_profile->EqualsForUpdatePurposes(profile)) {
- profiles_.erase(base::ranges::find(profiles_, existing_profile->guid(),
- &AutofillProfile::guid));
+ profiles_.erase(std::ranges::find(profiles_, existing_profile->guid(),
+ &AutofillProfile::guid));
profiles_.push_back(profile);
}
break;
case AutofillProfileChange::REMOVE:
if (existing_profile) {
- profiles_.erase(base::ranges::find(profiles_, existing_profile->guid(),
- &AutofillProfile::guid));
+ profiles_.erase(std::ranges::find(profiles_, existing_profile->guid(),
+ &AutofillProfile::guid));
}
break;
}
diff --git a/components/autofill/core/browser/data_manager/addresses/test_address_data_manager.cc b/components/autofill/core/browser/data_manager/addresses/test_address_data_manager.cc
index cb22a4f1..ea58ce0f 100644
--- a/components/autofill/core/browser/data_manager/addresses/test_address_data_manager.cc
+++ b/components/autofill/core/browser/data_manager/addresses/test_address_data_manager.cc
@@ -37,7 +37,7 @@
void TestAddressDataManager::UpdateProfile(const AutofillProfile& profile) {
auto adm_profile =
- base::ranges::find(profiles_, profile.guid(), &AutofillProfile::guid);
+ std::ranges::find(profiles_, profile.guid(), &AutofillProfile::guid);
if (adm_profile != profiles_.end()) {
*adm_profile = profile;
NotifyObservers();
@@ -45,7 +45,7 @@
}
void TestAddressDataManager::RemoveProfile(const std::string& guid) {
- profiles_.erase(base::ranges::find(profiles_, guid, &AutofillProfile::guid));
+ profiles_.erase(std::ranges::find(profiles_, guid, &AutofillProfile::guid));
NotifyObservers();
}
@@ -56,7 +56,7 @@
void TestAddressDataManager::RecordUseOf(const AutofillProfile& profile) {
auto adm_profile =
- base::ranges::find(profiles_, profile.guid(), &AutofillProfile::guid);
+ std::ranges::find(profiles_, profile.guid(), &AutofillProfile::guid);
if (adm_profile != profiles_.end()) {
adm_profile->RecordAndLogUse();
}
diff --git a/components/autofill/core/browser/data_manager/payments/payments_data_manager.cc b/components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
index df635fc1..baa2f30b 100644
--- a/components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
+++ b/components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/data_manager/payments/payments_data_manager.h"
+#include <algorithm>
#include <memory>
#include "base/containers/span.h"
@@ -12,7 +13,6 @@
#include "base/functional/callback_forward.h"
#include "base/i18n/timezone.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/uuid.h"
#include "components/autofill/core/browser/autofill_shared_storage_handler.h"
@@ -98,7 +98,7 @@
typename std::vector<T>::const_iterator FindElementByGUID(
const std::vector<T>& container,
std::string_view guid) {
- return base::ranges::find(container, guid, [](const auto& element) {
+ return std::ranges::find(container, guid, [](const auto& element) {
return Deref(element).guid();
});
}
@@ -125,7 +125,7 @@
CHECK_NE(card->record_type(), CreditCard::RecordType::kFullServerCard);
// Masked server cards are preferred over their local duplicates.
if (!CreditCard::IsLocalCard(card) ||
- base::ranges::none_of(
+ std::ranges::none_of(
cards_to_suggest, [&card](const CreditCard* other_card) {
return card != other_card &&
card->IsLocalOrServerDuplicateOf(*other_card);
@@ -777,12 +777,11 @@
});
});
- base::ranges::sort(available_ibans,
- [comparison_time = AutofillClock::Now()](
- const Iban* iban0, const Iban* iban1) {
- return iban0->usage_history().HasGreaterRankingThan(
- iban1->usage_history(), comparison_time);
- });
+ std::ranges::sort(available_ibans, [comparison_time = AutofillClock::Now()](
+ const Iban* iban0, const Iban* iban1) {
+ return iban0->usage_history().HasGreaterRankingThan(iban1->usage_history(),
+ comparison_time);
+ });
std::vector<Iban> ibans_to_suggest;
ibans_to_suggest.reserve(available_ibans.size());
@@ -863,7 +862,7 @@
return {};
}
std::vector<const AutofillOfferData*> promo_code_offers_for_origin;
- base::ranges::for_each(
+ std::ranges::for_each(
autofill_offer_data_,
[&](const std::unique_ptr<AutofillOfferData>& autofill_offer_data) {
if (autofill_offer_data.get()->IsPromoCodeOffer() &&
@@ -1099,7 +1098,7 @@
std::vector<const CreditCard*> server_cards = GetServerCreditCards();
auto it =
- base::ranges::find_if(server_cards, [&](const CreditCard* server_card) {
+ std::ranges::find_if(server_cards, [&](const CreditCard* server_card) {
return local_card->IsLocalOrServerDuplicateOf(*server_card);
});
return it != server_cards.end() ? *it : nullptr;
@@ -1280,7 +1279,7 @@
: GetLocalCreditCards());
// Rank the cards by ranking score (see UsageHistoryInformation for details).
// All expired cards should be suggested last, also by ranking score.
- base::ranges::sort(
+ std::ranges::sort(
cards_to_suggest,
[comparison_time = base::Time::Now(), should_use_legacy_algorithm](
const CreditCard* a, const CreditCard* b) {
@@ -2088,7 +2087,7 @@
}
size_t PaymentsDataManager::GetServerCardWithArtImageCount() const {
- return base::ranges::count_if(
+ return std::ranges::count_if(
server_credit_cards_.begin(), server_credit_cards_.end(),
[](const auto& card) { return card->card_art_url().is_valid(); });
}
diff --git a/components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc b/components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc
index c6a81fa..bf96a58 100644
--- a/components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc
+++ b/components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <list>
#include <map>
#include <memory>
@@ -16,7 +17,6 @@
#include "base/containers/contains.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/autofill/core/browser/data_manager/payments/test_payments_data_manager.cc b/components/autofill/core/browser/data_manager/payments/test_payments_data_manager.cc
index 1dd6a32..5e4c5f4 100644
--- a/components/autofill/core/browser/data_manager/payments/test_payments_data_manager.cc
+++ b/components/autofill/core/browser/data_manager/payments/test_payments_data_manager.cc
@@ -84,12 +84,12 @@
void TestPaymentsDataManager::RemoveByGUID(const std::string& guid) {
if (const CreditCard* credit_card = GetCreditCardByGUID(guid)) {
- local_credit_cards_.erase(base::ranges::find(
+ local_credit_cards_.erase(std::ranges::find(
local_credit_cards_, credit_card, &std::unique_ptr<CreditCard>::get));
NotifyObservers();
} else if (const Iban* iban = GetIbanByGUID(guid)) {
local_ibans_.erase(
- base::ranges::find(local_ibans_, iban, &std::unique_ptr<Iban>::get));
+ std::ranges::find(local_ibans_, iban, &std::unique_ptr<Iban>::get));
NotifyObservers();
}
}
@@ -104,12 +104,11 @@
std::unique_ptr<Iban> updated_iban = std::make_unique<Iban>(iban);
std::vector<std::unique_ptr<Iban>>& container =
iban.record_type() == Iban::kLocalIban ? local_ibans_ : server_ibans_;
- auto it =
- base::ranges::find(container,
- iban.record_type() == Iban::kLocalIban
- ? GetIbanByGUID(iban.guid())
- : GetIbanByInstrumentId(iban.instrument_id()),
- &std::unique_ptr<Iban>::get);
+ auto it = std::ranges::find(container,
+ iban.record_type() == Iban::kLocalIban
+ ? GetIbanByGUID(iban.guid())
+ : GetIbanByInstrumentId(iban.instrument_id()),
+ &std::unique_ptr<Iban>::get);
if (it != container.end()) {
it->get()->RecordAndLogUse();
}
@@ -340,8 +339,8 @@
void TestPaymentsDataManager::RemoveCardWithoutNotification(
const CreditCard& card) {
- if (auto it = base::ranges::find(local_credit_cards_, card.guid(),
- &CreditCard::guid);
+ if (auto it = std::ranges::find(local_credit_cards_, card.guid(),
+ &CreditCard::guid);
it != local_credit_cards_.end()) {
local_credit_cards_.erase(it);
}
diff --git a/components/autofill/core/browser/data_model/autofill_i18n_api_unittest.cc b/components/autofill/core/browser/data_model/autofill_i18n_api_unittest.cc
index 3ff5342..a7e8a99 100644
--- a/components/autofill/core/browser/data_model/autofill_i18n_api_unittest.cc
+++ b/components/autofill/core/browser/data_model/autofill_i18n_api_unittest.cc
@@ -4,11 +4,11 @@
#include "components/autofill/core/browser/data_model/autofill_i18n_api.h"
+#include <algorithm>
#include <string>
#include <type_traits>
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
#include "components/autofill/core/browser/data_model/autofill_i18n_formatting_expressions.h"
diff --git a/components/autofill/core/browser/data_model/autofill_offer_data.cc b/components/autofill/core/browser/data_model/autofill_offer_data.cc
index 0f4407a6..392df4b3 100644
--- a/components/autofill/core/browser/data_model/autofill_offer_data.cc
+++ b/components/autofill/core/browser/data_model/autofill_offer_data.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/common/autofill_clock.h"
namespace autofill {
@@ -134,7 +133,7 @@
bool AutofillOfferData::IsActiveAndEligibleForOrigin(const GURL& origin) const {
return expiry_ > AutofillClock::Now() &&
- base::ranges::count(merchant_origins_, origin) > 0;
+ std::ranges::count(merchant_origins_, origin) > 0;
}
AutofillOfferData::AutofillOfferData(
diff --git a/components/autofill/core/browser/data_model/autofill_profile.cc b/components/autofill/core/browser/data_model/autofill_profile.cc
index b58d9bce..7b5272f 100644
--- a/components/autofill/core/browser/data_model/autofill_profile.cc
+++ b/components/autofill/core/browser/data_model/autofill_profile.cc
@@ -24,7 +24,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversion_utils.h"
@@ -1234,7 +1233,7 @@
FieldTypeSet field_types_to_print;
profile.GetSupportedTypes(&field_types_to_print);
- base::ranges::for_each(field_types_to_print, print_values_lambda);
+ std::ranges::for_each(field_types_to_print, print_values_lambda);
return os;
}
diff --git a/components/autofill/core/browser/data_model/autofill_profile_comparator.cc b/components/autofill/core/browser/data_model/autofill_profile_comparator.cc
index 386e542..19182218 100644
--- a/components/autofill/core/browser/data_model/autofill_profile_comparator.cc
+++ b/components/autofill/core/browser/data_model/autofill_profile_comparator.cc
@@ -12,7 +12,6 @@
#include "base/i18n/char_iterator.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversion_utils.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/autofill/core/browser/data_model/autofill_profile_unittest.cc b/components/autofill/core/browser/data_model/autofill_profile_unittest.cc
index a3c1331..5d33208c 100644
--- a/components/autofill/core/browser/data_model/autofill_profile_unittest.cc
+++ b/components/autofill/core/browser/data_model/autofill_profile_unittest.cc
@@ -1463,11 +1463,11 @@
ASSERT_NE(value1, value2);
ASSERT_NE(status1, status2);
std::vector<AddressCountryCode> country_codes;
- base::ranges::transform(country_data_map->country_codes(),
- back_inserter(country_codes),
- [](const std::string& country_code) {
- return AddressCountryCode(country_code);
- });
+ std::ranges::transform(country_data_map->country_codes(),
+ back_inserter(country_codes),
+ [](const std::string& country_code) {
+ return AddressCountryCode(country_code);
+ });
// Include the legacy country code as well.
country_codes.push_back(i18n_model_definition::kLegacyHierarchyCountryCode);
diff --git a/components/autofill/core/browser/data_model/autofill_structured_address_component.cc b/components/autofill/core/browser/data_model/autofill_structured_address_component.cc
index 9dffba79..dace90cf 100644
--- a/components/autofill/core/browser/data_model/autofill_structured_address_component.cc
+++ b/components/autofill/core/browser/data_model/autofill_structured_address_component.cc
@@ -12,7 +12,6 @@
#include "base/containers/to_vector.h"
#include "base/feature_list.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/autofill/core/browser/data_model/phone_number_unittest.cc b/components/autofill/core/browser/data_model/phone_number_unittest.cc
index d157dfb..40b1bc8 100644
--- a/components/autofill/core/browser/data_model/phone_number_unittest.cc
+++ b/components/autofill/core/browser/data_model/phone_number_unittest.cc
@@ -4,11 +4,11 @@
#include "components/autofill/core/browser/data_model/phone_number.h"
+#include <algorithm>
#include <string>
#include "base/containers/contains.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
#include "components/autofill/core/browser/autofill_type.h"
@@ -307,7 +307,7 @@
return GroupTypeOfFieldType(type) != FieldTypeGroup::kPhone;
});
- base::ranges::for_each(fields, [](FieldType type) {
+ std::ranges::for_each(fields, [](FieldType type) {
PhoneNumber::PhoneCombineHelper helper;
helper.SetInfo(type, u"123");
});
diff --git a/components/autofill/core/browser/data_quality/addresses/profile_token_quality.cc b/components/autofill/core/browser/data_quality/addresses/profile_token_quality.cc
index 4b63628..efefe8c 100644
--- a/components/autofill/core/browser/data_quality/addresses/profile_token_quality.cc
+++ b/components/autofill/core/browser/data_quality/addresses/profile_token_quality.cc
@@ -13,7 +13,6 @@
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/levenshtein_distance.h"
#include "base/strings/string_util.h"
#include "base/types/cxx23_to_underlying.h"
@@ -117,11 +116,11 @@
// Element-wise comparison between `observations_` and `other.observations_`.
// base::circular_deque<> intentionally doesn't define a comparison operator.
using map_entry_t = std::pair<FieldType, base::circular_deque<Observation>>;
- return base::ranges::equal(observations_, other.observations_,
- [](const map_entry_t& a, const map_entry_t& b) {
- return a.first == b.first &&
- base::ranges::equal(a.second, b.second);
- });
+ return std::ranges::equal(observations_, other.observations_,
+ [](const map_entry_t& a, const map_entry_t& b) {
+ return a.first == b.first &&
+ std::ranges::equal(a.second, b.second);
+ });
}
bool ProfileTokenQuality::AddObservationsForFilledForm(
diff --git a/components/autofill/core/browser/data_quality/addresses/profile_token_quality_unittest.cc b/components/autofill/core/browser/data_quality/addresses/profile_token_quality_unittest.cc
index e7a4fd0..6178bd1 100644
--- a/components/autofill/core/browser/data_quality/addresses/profile_token_quality_unittest.cc
+++ b/components/autofill/core/browser/data_quality/addresses/profile_token_quality_unittest.cc
@@ -4,12 +4,12 @@
#include "components/autofill/core/browser/data_quality/addresses/profile_token_quality.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <string_view>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "base/test/task_environment.h"
#include "base/types/cxx23_to_underlying.h"
#include "components/autofill/core/browser/autofill_field.h"
@@ -349,7 +349,7 @@
EXPECT_TRUE(quality.AddObservationsForFilledForm(
*bam_.FindCachedFormById(form.global_id()), form, adm()));
EXPECT_EQ(test.expected_number_of_observations,
- base::ranges::count_if(test.form_types, [&](FieldType type) {
+ std::ranges::count_if(test.form_types, [&](FieldType type) {
return !quality.GetObservationTypesForFieldType(type).empty();
}));
}
diff --git a/components/autofill/core/browser/field_type_utils.cc b/components/autofill/core/browser/field_type_utils.cc
index 5fe558ff..4d05940d 100644
--- a/components/autofill/core/browser/field_type_utils.cc
+++ b/components/autofill/core/browser/field_type_utils.cc
@@ -58,8 +58,8 @@
size_t NumberOfPossibleFieldTypesInGroup(const AutofillField& field,
FieldTypeGroup group) {
- return base::ranges::count(field.possible_types(), group,
- GroupTypeOfFieldType);
+ return std::ranges::count(field.possible_types(), group,
+ GroupTypeOfFieldType);
}
bool FieldHasMeaningfulPossibleFieldTypes(const AutofillField& field) {
diff --git a/components/autofill/core/browser/filling/addresses/field_filling_address_util.cc b/components/autofill/core/browser/filling/addresses/field_filling_address_util.cc
index ed4af99..82da108 100644
--- a/components/autofill/core/browser/filling/addresses/field_filling_address_util.cc
+++ b/components/autofill/core/browser/filling/addresses/field_filling_address_util.cc
@@ -4,13 +4,13 @@
#include "components/autofill/core/browser/filling/addresses/field_filling_address_util.h"
+#include <algorithm>
#include <optional>
#include <string>
#include "base/i18n/char_iterator.h"
#include "base/i18n/unicodestring.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -162,10 +162,10 @@
// Remove `abbreviations` from the `full_names` as a precautionary measure in
// case the `AlternativeStateNameMap` contains bad data.
- base::ranges::sort(abbreviations);
+ std::ranges::sort(abbreviations);
std::erase_if(full_names, [&](const std::u16string& full_name) {
return full_name.empty() ||
- base::ranges::binary_search(abbreviations, full_name);
+ std::ranges::binary_search(abbreviations, full_name);
});
// Try an exact match of the abbreviation first.
@@ -414,7 +414,7 @@
phone_country_code;
};
auto first_match =
- base::ranges::find_if(field_options, value_or_content_matches);
+ std::ranges::find_if(field_options, value_or_content_matches);
if (base::FeatureList::IsEnabled(
features::
@@ -440,7 +440,7 @@
}
// If the <option>s do contain phone country codes, we pick the current
// option only if the phone country code matches.
- auto selected_option = base::ranges::find_if(
+ auto selected_option = std::ranges::find_if(
field_options,
[&](const SelectOption& o) { return o.value == option; });
if (value_or_content_matches(*selected_option)) {
diff --git a/components/autofill/core/browser/filling/addresses/field_filling_address_util_unittest.cc b/components/autofill/core/browser/filling/addresses/field_filling_address_util_unittest.cc
index 925379e..dff1e6cd 100644
--- a/components/autofill/core/browser/filling/addresses/field_filling_address_util_unittest.cc
+++ b/components/autofill/core/browser/filling/addresses/field_filling_address_util_unittest.cc
@@ -4,12 +4,12 @@
#include "components/autofill/core/browser/filling/addresses/field_filling_address_util.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <vector>
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
#include "components/autofill/core/browser/autofill_field.h"
diff --git a/components/autofill/core/browser/filling/form_autofill_history.cc b/components/autofill/core/browser/filling/form_autofill_history.cc
index e63feb8e..38c3030 100644
--- a/components/autofill/core/browser/filling/form_autofill_history.cc
+++ b/components/autofill/core/browser/filling/form_autofill_history.cc
@@ -99,7 +99,7 @@
FormAutofillHistory::FillOperation
FormAutofillHistory::GetLastFillingOperationForField(
FieldGlobalId field_id) const {
- return FillOperation(base::ranges::find_if(
+ return FillOperation(std::ranges::find_if(
history_, [&field_id](const FormFillingEntry& operation) {
return operation.field_filling_entries.contains(field_id);
}));
diff --git a/components/autofill/core/browser/filling/form_filler.cc b/components/autofill/core/browser/filling/form_filler.cc
index 51e09cf..226b8e89 100644
--- a/components/autofill/core/browser/filling/form_filler.cc
+++ b/components/autofill/core/browser/filling/form_filler.cc
@@ -711,15 +711,15 @@
safe_filled_fields.old_values.push_back(
form.FindFieldByGlobalId(field_id));
safe_filled_fields.new_values.push_back([&] {
- auto fields_it = base::ranges::find(result_fields, field_id,
- &FormFieldData::global_id);
+ auto fields_it = std::ranges::find(result_fields, field_id,
+ &FormFieldData::global_id);
return fields_it != result_fields.end() ? &*fields_it : nullptr;
}());
safe_filled_fields.cached.push_back(
form_structure.GetFieldById(field_id));
} else {
- auto it = base::ranges::find(form.fields(), field_id,
- &FormFieldData::global_id);
+ auto it =
+ std::ranges::find(form.fields(), field_id, &FormFieldData::global_id);
CHECK(it != result_fields.end());
std::string field_number =
base::StringPrintf("Field %zu", it - result_fields.begin());
@@ -842,7 +842,7 @@
field->renderer_id());
};
auto it =
- base::ranges::max_element(*form_structure, {}, comparison_attributes);
+ std::ranges::max_element(*form_structure, {}, comparison_attributes);
AutofillField* autofill_field =
it != form_structure->end() ? it->get() : nullptr;
bool found_matching_element =
diff --git a/components/autofill/core/browser/filling/form_filler_unittest.cc b/components/autofill/core/browser/filling/form_filler_unittest.cc
index 9cb0e9b..23b957c 100644
--- a/components/autofill/core/browser/filling/form_filler_unittest.cc
+++ b/components/autofill/core/browser/filling/form_filler_unittest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <optional>
#include <string>
@@ -12,7 +13,6 @@
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "base/time/time.h"
@@ -202,8 +202,8 @@
/*ignorable_skip_reasons=*/{}, trigger_source);
// Copy the filled data into the form.
for (FormFieldData& field : test_api(form).fields()) {
- if (auto it = base::ranges::find(filled_fields, field.global_id(),
- &FormFieldData::global_id);
+ if (auto it = std::ranges::find(filled_fields, field.global_id(),
+ &FormFieldData::global_id);
it != filled_fields.end()) {
field = *it;
}
diff --git a/components/autofill/core/browser/filling/payments/field_filling_payments_util.cc b/components/autofill/core/browser/filling/payments/field_filling_payments_util.cc
index db2d79c..fd17a487 100644
--- a/components/autofill/core/browser/filling/payments/field_filling_payments_util.cc
+++ b/components/autofill/core/browser/filling/payments/field_filling_payments_util.cc
@@ -4,9 +4,9 @@
#include "components/autofill/core/browser/filling/payments/field_filling_payments_util.h"
+#include <algorithm>
#include <optional>
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "components/autofill/core/browser/autofill_field.h"
@@ -15,8 +15,8 @@
#include "components/autofill/core/browser/data_quality/autofill_data_util.h"
#include "components/autofill/core/browser/field_type_utils.h"
#include "components/autofill/core/browser/field_types.h"
-#include "components/autofill/core/browser/filling/form_filler.h"
#include "components/autofill/core/browser/filling/filling_product.h"
+#include "components/autofill/core/browser/filling/form_filler.h"
#include "components/autofill/core/browser/form_parsing/credit_card_field_parser.h"
#include "components/autofill/core/browser/form_structure.h"
#include "components/autofill/core/browser/select_control_util.h"
@@ -409,7 +409,7 @@
// Replaces the digits in `value` with dots. Used for credit card preview when
// obfuscating card information to the user.
std::u16string ReplaceDigitsWithCenterDots(std::u16string value) {
- base::ranges::replace_if(
+ std::ranges::replace_if(
value.begin(), value.end(),
[](char16_t c) { return base::IsAsciiDigit(c); },
kMidlineEllipsisPlainDot);
@@ -524,8 +524,8 @@
// exists in the renderer and whether it is fillable.
auto IsFillableField =
[&fields, &trigger_autofill_field](const AutofillField& autofill_field) {
- auto field = base::ranges::find(fields, autofill_field.global_id(),
- &FormFieldData::global_id);
+ auto field = std::ranges::find(fields, autofill_field.global_id(),
+ &FormFieldData::global_id);
if (field == fields.end()) {
return false;
}
diff --git a/components/autofill/core/browser/filling/payments/field_filling_payments_util_unittest.cc b/components/autofill/core/browser/filling/payments/field_filling_payments_util_unittest.cc
index 3e1fbb8..923db9e 100644
--- a/components/autofill/core/browser/filling/payments/field_filling_payments_util_unittest.cc
+++ b/components/autofill/core/browser/filling/payments/field_filling_payments_util_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <string>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/files/file_path.h"
#include "base/notreached.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
@@ -97,7 +97,7 @@
size_t GetIndexOfValue(const std::vector<SelectOption>& values,
const std::u16string& value) {
size_t i =
- base::ranges::find(values, value, &SelectOption::value) - values.begin();
+ std::ranges::find(values, value, &SelectOption::value) - values.begin();
CHECK_LT(i, values.size()) << "Passing invalid arguments to GetIndexOfValue";
return i;
}
@@ -245,7 +245,7 @@
CreditCard credit_card;
credit_card.SetNumber(u"4111111111111111");
// Verify that the field contains 4 but no more than 4 digits.
- size_t num_digits = base::ranges::count_if(
+ size_t num_digits = std::ranges::count_if(
GetFillingValueForCreditCard(credit_card, kAppLocale,
mojom::ActionPersistence::kPreview, field),
&base::IsAsciiDigit<char16_t>);
diff --git a/components/autofill/core/browser/form_import/addresses/address_profile_save_manager_unittest.cc b/components/autofill/core/browser/form_import/addresses/address_profile_save_manager_unittest.cc
index b27fe34d..a5eda52 100644
--- a/components/autofill/core/browser/form_import/addresses/address_profile_save_manager_unittest.cc
+++ b/components/autofill/core/browser/form_import/addresses/address_profile_save_manager_unittest.cc
@@ -388,10 +388,10 @@
}
// The import can only be one of {new, updated, migrated} profile at once.
ASSERT_EQ(
- base::ranges::count(std::vector<bool>{IsNewProfile(test_scenario),
- IsConfirmableMerge(test_scenario),
- IsMigration(test_scenario)},
- true),
+ std::ranges::count(std::vector<bool>{IsNewProfile(test_scenario),
+ IsConfirmableMerge(test_scenario),
+ IsMigration(test_scenario)},
+ true),
1);
const ImportHistogramNames& affected_histograms =
diff --git a/components/autofill/core/browser/form_import/addresses/autofill_profile_import_process.cc b/components/autofill/core/browser/form_import/addresses/autofill_profile_import_process.cc
index 08be4b3..0c11714 100644
--- a/components/autofill/core/browser/form_import/addresses/autofill_profile_import_process.cc
+++ b/components/autofill/core/browser/form_import/addresses/autofill_profile_import_process.cc
@@ -4,11 +4,11 @@
#include "components/autofill/core/browser/form_import/addresses/autofill_profile_import_process.h"
+#include <algorithm>
#include <map>
#include "base/check_deref.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/data_manager/addresses/address_data_cleaner.h"
#include "components/autofill/core/browser/data_manager/addresses/address_data_manager.h"
diff --git a/components/autofill/core/browser/form_import/form_data_importer.cc b/components/autofill/core/browser/form_import/form_data_importer.cc
index e0596a6f..44e39789 100644
--- a/components/autofill/core/browser/form_import/form_data_importer.cc
+++ b/components/autofill/core/browser/form_import/form_data_importer.cc
@@ -18,7 +18,6 @@
#include "base/check_deref.h"
#include "base/containers/flat_map.h"
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -999,7 +998,7 @@
// the index of the option text in the select options and try the
// corresponding value.
if (auto it =
- base::ranges::find(field.options(), value, &SelectOption::text);
+ std::ranges::find(field.options(), value, &SelectOption::text);
it != field.options().end()) {
result.card.SetInfo(field.Type(), it->value, app_locale);
}
diff --git a/components/autofill/core/browser/form_import/form_data_importer_unittest.cc b/components/autofill/core/browser/form_import/form_data_importer_unittest.cc
index a1ab720..11bdfdd 100644
--- a/components/autofill/core/browser/form_import/form_data_importer_unittest.cc
+++ b/components/autofill/core/browser/form_import/form_data_importer_unittest.cc
@@ -23,7 +23,6 @@
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/metrics/histogram_tester.h"
@@ -259,8 +258,8 @@
void SetValueForType(TypeValuePairs& pairs,
FieldType type,
const std::string& value) {
- auto it = base::ranges::find(pairs, type,
- [](const auto& pair) { return pair.first; });
+ auto it = std::ranges::find(pairs, type,
+ [](const auto& pair) { return pair.first; });
CHECK(it != pairs.end());
if (value.empty()) {
pairs.erase(it);
@@ -421,7 +420,7 @@
TypeValuePairs a = GetDefaultProfileTypeValuePairs();
TypeValuePairs b = GetSecondProfileTypeValuePairs();
a.reserve(a.size() + b.size());
- base::ranges::move(b, std::back_inserter(a));
+ std::ranges::move(b, std::back_inserter(a));
return ConstructFormStructureFromTypeValuePairs(a);
}
@@ -443,7 +442,7 @@
TypeValuePairs a = GetDefaultProfileTypeValuePairs();
TypeValuePairs b = GetSecondProfileTypeValuePairs();
a.reserve(a.size() + b.size());
- base::ranges::move(b, std::back_inserter(a));
+ std::ranges::move(b, std::back_inserter(a));
return ConstructFormDateFromTypeValuePairs(a);
}
diff --git a/components/autofill/core/browser/form_parsing/regex_patterns_unittest.cc b/components/autofill/core/browser/form_parsing/regex_patterns_unittest.cc
index f605343..73f44d6e 100644
--- a/components/autofill/core/browser/form_parsing/regex_patterns_unittest.cc
+++ b/components/autofill/core/browser/form_parsing/regex_patterns_unittest.cc
@@ -8,13 +8,13 @@
// components/autofill/core/browser/autofill_regexes_unittest.cc.
// Only these tests will be kept once the pattern provider launches.
+#include <ranges>
#include <string>
#include <string_view>
#include <vector>
#include "base/containers/flat_set.h"
#include "base/logging.h"
-#include "base/ranges/ranges.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/form_parsing/buildflags.h"
#include "components/autofill/core/browser/form_parsing/regex_patterns_inl.h"
diff --git a/components/autofill/core/browser/form_processing/name_processing_util.cc b/components/autofill/core/browser/form_processing/name_processing_util.cc
index 638d81f8..3ea23361 100644
--- a/components/autofill/core/browser/form_processing/name_processing_util.cc
+++ b/components/autofill/core/browser/form_processing/name_processing_util.cc
@@ -12,7 +12,6 @@
#include "base/check.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/common/autofill_features.h"
#include "components/autofill/core/common/autofill_regexes.h"
@@ -56,7 +55,7 @@
if (std::ranges::all_of(strings, [&](std::u16string_view s) {
return IsValidParseableName(RemoveAffix(s));
})) {
- base::ranges::transform(strings, strings.begin(), RemoveAffix);
+ std::ranges::transform(strings, strings.begin(), RemoveAffix);
}
}
diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
index e6fa183c..46501f0 100644
--- a/components/autofill/core/browser/form_structure.cc
+++ b/components/autofill/core/browser/form_structure.cc
@@ -30,7 +30,6 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
@@ -475,7 +474,7 @@
field->html_type() != HtmlFieldType::kUnspecified);
};
- size_t num_text_fields = base::ranges::count_if(
+ size_t num_text_fields = std::ranges::count_if(
fields(), require_classified_field ? is_focusable_predicted_text_field
: is_focusable_text_field);
if (num_text_fields == 0) {
@@ -486,7 +485,7 @@
// "search" in its name/id/placeholder, the function return false and the form
// is not recorded into UKM. The form is considered a search box.
if (num_text_fields == 1) {
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
fields(), require_classified_field ? is_focusable_predicted_text_field
: is_focusable_text_field);
if (base::ToLowerASCII((*it)->placeholder()).find(u"search") !=
@@ -831,7 +830,7 @@
}
const AutofillField* FormStructure::GetFieldById(FieldGlobalId field_id) const {
- auto it = base::ranges::find(
+ auto it = std::ranges::find(
fields_, field_id, [](const auto& field) { return field->global_id(); });
return it != fields_.end() ? it->get() : nullptr;
}
diff --git a/components/autofill/core/browser/form_structure_rationalization_engine_unittest.cc b/components/autofill/core/browser/form_structure_rationalization_engine_unittest.cc
index 6cb05d21..194b8a9 100644
--- a/components/autofill/core/browser/form_structure_rationalization_engine_unittest.cc
+++ b/components/autofill/core/browser/form_structure_rationalization_engine_unittest.cc
@@ -50,7 +50,7 @@
std::vector<FieldType> GetTypes(
const std::vector<std::unique_ptr<AutofillField>>& fields) {
std::vector<FieldType> server_types;
- base::ranges::transform(
+ std::ranges::transform(
fields, std::back_inserter(server_types),
[](const auto& field) { return field->Type().GetStorableType(); });
return server_types;
diff --git a/components/autofill/core/browser/form_structure_rationalizer.cc b/components/autofill/core/browser/form_structure_rationalizer.cc
index a1c7c2d5..afc15a4 100644
--- a/components/autofill/core/browser/form_structure_rationalizer.cc
+++ b/components/autofill/core/browser/form_structure_rationalizer.cc
@@ -4,8 +4,9 @@
#include "components/autofill/core/browser/form_structure_rationalizer.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/browser/form_parsing/autofill_parsing_utils.h"
#include "components/autofill/core/browser/form_parsing/credit_card_field_parser.h"
diff --git a/components/autofill/core/browser/form_structure_sectioning_util.cc b/components/autofill/core/browser/form_structure_sectioning_util.cc
index c6b3a14..aefa57f 100644
--- a/components/autofill/core/browser/form_structure_sectioning_util.cc
+++ b/components/autofill/core/browser/form_structure_sectioning_util.cc
@@ -4,11 +4,11 @@
#include "components/autofill/core/browser/form_structure_sectioning_util.h"
+#include <algorithm>
#include <iterator>
#include <memory>
#include <utility>
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/autofill_field.h"
#include "components/autofill/core/browser/field_types.h"
@@ -70,7 +70,7 @@
void AssignCreditCardSections(
base::span<const std::unique_ptr<AutofillField>> fields,
base::flat_map<LocalFrameToken, size_t>& frame_token_ids) {
- auto first_cc_field = base::ranges::find_if(
+ auto first_cc_field = std::ranges::find_if(
fields, [](const std::unique_ptr<AutofillField>& field) {
return field->Type().group() == FieldTypeGroup::kCreditCard &&
!field->section();
diff --git a/components/autofill/core/browser/foundations/autofill_driver_router.cc b/components/autofill/core/browser/foundations/autofill_driver_router.cc
index cd817b4..c9eec89f 100644
--- a/components/autofill/core/browser/foundations/autofill_driver_router.cc
+++ b/components/autofill/core/browser/foundations/autofill_driver_router.cc
@@ -12,7 +12,6 @@
#include "base/containers/to_vector.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/autofill/core/common/autofill_features.h"
#include "components/autofill/core/common/mojom/autofill_types.mojom-shared.h"
diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/components/autofill/core/browser/foundations/autofill_manager.cc
index 6910694..e438e1d 100644
--- a/components/autofill/core/browser/foundations/autofill_manager.cc
+++ b/components/autofill/core/browser/foundations/autofill_manager.cc
@@ -493,7 +493,7 @@
}
*form_structure = cached_form;
auto field_it =
- base::ranges::find(*cached_form, field_id, &AutofillField::global_id);
+ std::ranges::find(*cached_form, field_id, &AutofillField::global_id);
*autofill_field = field_it == cached_form->end() ? nullptr : field_it->get();
return *autofill_field != nullptr;
}
@@ -609,7 +609,7 @@
// Remove duplicates by their FormGlobalId. Otherwise, after moving the forms
// into `form_structures_`, duplicates may be destroyed and we'd end up with
// dangling pointers.
- base::ranges::sort(form_structures, {}, &FormStructure::global_id);
+ std::ranges::sort(form_structures, {}, &FormStructure::global_id);
auto repeated =
std::ranges::unique(form_structures, {}, &FormStructure::global_id);
form_structures.erase(repeated.begin(), repeated.end());
diff --git a/components/autofill/core/browser/foundations/autofill_manager_unittest.cc b/components/autofill/core/browser/foundations/autofill_manager_unittest.cc
index a6e49a4..cbd0705b 100644
--- a/components/autofill/core/browser/foundations/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/foundations/autofill_manager_unittest.cc
@@ -4,13 +4,13 @@
#include "components/autofill/core/browser/foundations/autofill_manager.h"
+#include <algorithm>
#include <iterator>
#include <memory>
#include <tuple>
#include <vector>
#include "base/containers/to_vector.h"
-#include "base/ranges/algorithm.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
@@ -119,8 +119,8 @@
auto HaveSameFormIdsAs(const std::vector<FormData>& forms) {
std::vector<decltype(HaveSameFormIdAs(forms.front()))> matchers;
matchers.reserve(forms.size());
- base::ranges::transform(forms, std::back_inserter(matchers),
- &HaveSameFormIdAs);
+ std::ranges::transform(forms, std::back_inserter(matchers),
+ &HaveSameFormIdAs);
return UnorderedElementsAreArray(matchers);
}
diff --git a/components/autofill/core/browser/foundations/browser_autofill_manager.cc b/components/autofill/core/browser/foundations/browser_autofill_manager.cc
index e36e1cf..09e12735 100644
--- a/components/autofill/core/browser/foundations/browser_autofill_manager.cc
+++ b/components/autofill/core/browser/foundations/browser_autofill_manager.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <array>
#include <iterator>
#include <limits>
@@ -47,7 +48,6 @@
#include "base/metrics/user_metrics_action.h"
#include "base/notreached.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -406,23 +406,23 @@
context.is_context_secure);
// TODO(crbug.com/41484171): Move to payments_suggestion_generator.cc.
autofill_metrics::LogSuggestionsCount(
- base::ranges::count_if(suggestions,
- [](const Suggestion& suggestion) {
- return GetFillingProductFromSuggestionType(
- suggestion.type) ==
- FillingProduct::kCreditCard;
- }),
+ std::ranges::count_if(suggestions,
+ [](const Suggestion& suggestion) {
+ return GetFillingProductFromSuggestionType(
+ suggestion.type) ==
+ FillingProduct::kCreditCard;
+ }),
FillingProduct::kCreditCard);
}
if (context.filling_product == FillingProduct::kAddress) {
// TODO(crbug.com/41484171): Move to address_suggestion_generator.cc.
autofill_metrics::LogSuggestionsCount(
- base::ranges::count_if(suggestions,
- [](const Suggestion& suggestion) {
- return GetFillingProductFromSuggestionType(
- suggestion.type) ==
- FillingProduct::kAddress;
- }),
+ std::ranges::count_if(suggestions,
+ [](const Suggestion& suggestion) {
+ return GetFillingProductFromSuggestionType(
+ suggestion.type) ==
+ FillingProduct::kAddress;
+ }),
FillingProduct::kAddress);
}
}
@@ -548,7 +548,7 @@
// using a plus profile.
bool WasEmailOverrideAppliedOnSuggestions(
const std::vector<Suggestion>& address_suggestions) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
address_suggestions, [](const Suggestion& suggestion) {
const Suggestion::AutofillProfilePayload* profile_payload =
absl::get_if<Suggestion::AutofillProfilePayload>(
diff --git a/components/autofill/core/browser/foundations/browser_autofill_manager_unittest.cc b/components/autofill/core/browser/foundations/browser_autofill_manager_unittest.cc
index fd34e88..cbdf8be 100644
--- a/components/autofill/core/browser/foundations/browser_autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/foundations/browser_autofill_manager_unittest.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/foundations/browser_autofill_manager.h"
+#include <algorithm>
#include <cstddef>
#include <memory>
#include <optional>
@@ -20,7 +21,6 @@
#include "base/memory/ref_counted.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/metrics_hashes.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -1158,8 +1158,8 @@
FormData result_form = input_form;
// Copy the filled data into the form.
for (FormFieldData& field : test_api(result_form).fields()) {
- if (auto it = base::ranges::find(filled_fields, field.global_id(),
- &FormFieldData::global_id);
+ if (auto it = std::ranges::find(filled_fields, field.global_id(),
+ &FormFieldData::global_id);
it != filled_fields.end()) {
field = *it;
}
@@ -3399,7 +3399,7 @@
template <class T>
size_t CountEventOfType(
const std::vector<AutofillField::FieldLogEventType>& events) {
- return base::ranges::count_if(events, [](const auto& event) {
+ return std::ranges::count_if(events, [](const auto& event) {
return absl::holds_alternative<T>(event);
});
}
@@ -4674,7 +4674,7 @@
// Remove phone number field.
auto phonenumber_it =
- base::ranges::find(form.fields(), u"phonenumber", &FormFieldData::name);
+ std::ranges::find(form.fields(), u"phonenumber", &FormFieldData::name);
ASSERT_TRUE(phonenumber_it != form.fields().end());
test_api(form).fields().erase(phonenumber_it);
diff --git a/components/autofill/core/browser/foundations/form_forest.cc b/components/autofill/core/browser/foundations/form_forest.cc
index 389593e..57015ef3 100644
--- a/components/autofill/core/browser/foundations/form_forest.cc
+++ b/components/autofill/core/browser/foundations/form_forest.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/foundations/form_forest.h"
+#include <algorithm>
#include <limits>
#include <memory>
#include <optional>
@@ -18,7 +19,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/foundations/form_forest_util_inl.h"
#include "third_party/abseil-cpp/absl/types/variant.h"
@@ -54,8 +54,8 @@
if (!frame_data) {
return nullptr;
}
- auto it = base::ranges::find(frame_data->child_forms, form.renderer_id,
- &FormData::renderer_id);
+ auto it = std::ranges::find(frame_data->child_forms, form.renderer_id,
+ &FormData::renderer_id);
return it != frame_data->child_forms.end() ? &*it : nullptr;
}
@@ -63,8 +63,8 @@
for (;;) {
FrameData* frame = GetFrameData(form.frame_token);
if (!frame->parent_form) {
- auto it = base::ranges::find(frame->child_forms, form.renderer_id,
- &FormData::renderer_id);
+ auto it = std::ranges::find(frame->child_forms, form.renderer_id,
+ &FormData::renderer_id);
CHECK(it != frame->child_forms.end());
return {raw_ref(*frame), raw_ref(*it)};
}
@@ -550,9 +550,9 @@
// Finds or creates the renderer form from which `browser_field` originated.
// The form with `form_id` may have been removed from the tree, for example,
// between a fill and a refill.
- auto renderer_form = base::ranges::find(result.renderer_forms.rbegin(),
- result.renderer_forms.rend(),
- form_id, &FormData::global_id);
+ auto renderer_form = std::ranges::find(result.renderer_forms.rbegin(),
+ result.renderer_forms.rend(),
+ form_id, &FormData::global_id);
if (renderer_form == result.renderer_forms.rend()) {
const FormData* original_form = mutable_this.GetFormData(form_id);
if (!original_form) { // The form with |form_id| may have been removed.
diff --git a/components/autofill/core/browser/foundations/form_forest_unittest.cc b/components/autofill/core/browser/foundations/form_forest_unittest.cc
index 2fda907..da8ddb5 100644
--- a/components/autofill/core/browser/foundations/form_forest_unittest.cc
+++ b/components/autofill/core/browser/foundations/form_forest_unittest.cc
@@ -217,7 +217,7 @@
std::vector<std::vector<T>> ps;
ps.reserve(factorial(xs.size()));
ps.push_back(xs);
- base::ranges::sort(ps.front());
+ std::ranges::sort(ps.front());
while (std::ranges::next_permutation(ps.front()).found) {
ps.push_back(ps.front());
}
@@ -495,8 +495,8 @@
if (f.begin + f.count > source.fields().size()) {
f.count = base::dynamic_extent;
}
- base::ranges::copy(base::span(source.fields()).subspan(f.begin, f.count),
- std::back_inserter(fields));
+ std::ranges::copy(base::span(source.fields()).subspan(f.begin, f.count),
+ std::back_inserter(fields));
}
// Copy |mocked_forms_| into |flattened_forms_|, without fields.
@@ -520,7 +520,7 @@
FakeAutofillDriver& d = GetDriverOfForm(fs.form);
return !d.GetParent() || d.is_sub_root();
};
- auto it = base::ranges::find_if(form_fields, IsRoot);
+ auto it = std::ranges::find_if(form_fields, IsRoot);
CHECK(it != form_fields.end());
CHECK(std::ranges::all_of(form_fields, [&](FormSpan fs) {
return !IsRoot(fs) || fs.form == it->form;
diff --git a/components/autofill/core/browser/foundations/form_forest_util_inl.h b/components/autofill/core/browser/foundations/form_forest_util_inl.h
index 42cd4ed..b40bc0a3 100644
--- a/components/autofill/core/browser/foundations/form_forest_util_inl.h
+++ b/components/autofill/core/browser/foundations/form_forest_util_inl.h
@@ -18,13 +18,13 @@
// At most |r1| * |r2| comparisons.
// At most |r2| comparisons if |r1| is a subsequence of |r2|.
//
-// Unlike for base::ranges::set_difference, |r1| and |r2| do not need to be
+// Unlike for std::ranges::set_difference, |r1| and |r2| do not need to be
// sorted. Aside from the order of the |fun| calls,
-// base::ranges::sort(r1, {}, proj);
-// base::ranges::sort(r2, {}, proj);
+// std::ranges::sort(r1, {}, proj);
+// std::ranges::sort(r2, {}, proj);
// std::vector<decltype(fun(T()))> diff;
-// base::ranges::set_difference(r1, r2, std::back_inserter(diff), {}, proj);
-// base::ranges::for_each(diff, fun);
+// std::ranges::set_difference(r1, r2, std::back_inserter(diff), {}, proj);
+// std::ranges::for_each(diff, fun);
// is equivalent to
// for_each_in_set_difference(r1, r2, fun, proj).
//
diff --git a/components/autofill/core/browser/foundations/test_autofill_manager_waiter.cc b/components/autofill/core/browser/foundations/test_autofill_manager_waiter.cc
index b0f6cabf..2a0a14bd 100644
--- a/components/autofill/core/browser/foundations/test_autofill_manager_waiter.cc
+++ b/components/autofill/core/browser/foundations/test_autofill_manager_waiter.cc
@@ -405,7 +405,7 @@
}
FormStructure* FindForm() const {
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
manager_->form_structures(),
[&](const auto& p) { return pred_.Run(*p.second); });
return it != manager_->form_structures().end() ? it->second.get()
diff --git a/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc b/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc
index 7b37dc5b..e997b8e 100644
--- a/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc
+++ b/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/geo/alternative_state_name_map_updater.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/components/autofill/core/browser/geo/state_names.cc b/components/autofill/core/browser/geo/state_names.cc
index 6b2ca8ae..c34e4c6 100644
--- a/components/autofill/core/browser/geo/state_names.cc
+++ b/components/autofill/core/browser/geo/state_names.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <algorithm>
#include <string>
#include <string_view>
#include <utility>
#include "base/containers/fixed_flat_map.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -84,8 +84,8 @@
std::u16string_view GetNameForAbbreviation(std::u16string_view abbreviation) {
using Member = decltype(kStateData)::value_type;
- auto it = base::ranges::find(kStateData, base::ToLowerASCII(abbreviation),
- &Member::second);
+ auto it = std::ranges::find(kStateData, base::ToLowerASCII(abbreviation),
+ &Member::second);
return it != kStateData.end() ? it->first : std::u16string_view();
}
diff --git a/components/autofill/core/browser/heuristic_classification_unittests.cc b/components/autofill/core/browser/heuristic_classification_unittests.cc
index 6323053f..579e397f 100644
--- a/components/autofill/core/browser/heuristic_classification_unittests.cc
+++ b/components/autofill/core/browser/heuristic_classification_unittests.cc
@@ -772,7 +772,7 @@
std::string name = info.param.BaseName()
.ReplaceExtension(FILE_PATH_LITERAL(""))
.MaybeAsASCII();
- base::ranges::replace_if(name, [](char c) { return !std::isalnum(c); }, '_');
+ std::ranges::replace_if(name, [](char c) { return !std::isalnum(c); }, '_');
return name;
}
diff --git a/components/autofill/core/browser/integrators/autofill_optimization_guide.cc b/components/autofill/core/browser/integrators/autofill_optimization_guide.cc
index 11bc05d..5146f64 100644
--- a/components/autofill/core/browser/integrators/autofill_optimization_guide.cc
+++ b/components/autofill/core/browser/integrators/autofill_optimization_guide.cc
@@ -4,8 +4,9 @@
#include "components/autofill/core/browser/integrators/autofill_optimization_guide.h"
+#include <algorithm>
+
#include "base/containers/flat_set.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/autofill_field.h"
#include "components/autofill/core/browser/data_manager/payments/payments_data_manager.h"
#include "components/autofill/core/browser/data_model/credit_card.h"
diff --git a/components/autofill/core/browser/integrators/autofill_optimization_guide_unittest.cc b/components/autofill/core/browser/integrators/autofill_optimization_guide_unittest.cc
index a4c5cd6..7a9ed796 100644
--- a/components/autofill/core/browser/integrators/autofill_optimization_guide_unittest.cc
+++ b/components/autofill/core/browser/integrators/autofill_optimization_guide_unittest.cc
@@ -4,9 +4,9 @@
#include "components/autofill/core/browser/integrators/autofill_optimization_guide.h"
+#include <algorithm>
#include <memory>
-#include "base/ranges/algorithm.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "components/autofill/core/browser/country_type.h"
diff --git a/components/autofill/core/browser/logging/text_log_receiver.cc b/components/autofill/core/browser/logging/text_log_receiver.cc
index 57e373d..0d9ea39 100644
--- a/components/autofill/core/browser/logging/text_log_receiver.cc
+++ b/components/autofill/core/browser/logging/text_log_receiver.cc
@@ -4,9 +4,10 @@
#include "components/autofill/core/browser/logging/text_log_receiver.h"
+#include <algorithm>
+
#include "base/logging.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
namespace autofill {
@@ -91,7 +92,7 @@
for (const base::Value& entry : entries) {
DCHECK(entry.is_dict());
std::vector<std::string> rendered_entry = RenderEntry(entry.GetDict());
- base::ranges::move(rendered_entry, std::back_inserter(result));
+ std::ranges::move(rendered_entry, std::back_inserter(result));
}
return result;
}
diff --git a/components/autofill/core/browser/manual_testing_import.cc b/components/autofill/core/browser/manual_testing_import.cc
index fcad038..98866b6c 100644
--- a/components/autofill/core/browser/manual_testing_import.cc
+++ b/components/autofill/core/browser/manual_testing_import.cc
@@ -159,8 +159,8 @@
// collecting all GUIDs to remove first.
void RemoveAllExistingProfiles(AddressDataManager& adm) {
std::vector<std::string> existing_guids;
- base::ranges::transform(adm.GetProfiles(), std::back_inserter(existing_guids),
- &AutofillProfile::guid);
+ std::ranges::transform(adm.GetProfiles(), std::back_inserter(existing_guids),
+ &AutofillProfile::guid);
for (const std::string& guid : existing_guids) {
adm.RemoveProfile(guid);
}
diff --git a/components/autofill/core/browser/metrics/autofill_metrics.cc b/components/autofill/core/browser/metrics/autofill_metrics.cc
index 2c8d4f3..e73f0cf5 100644
--- a/components/autofill/core/browser/metrics/autofill_metrics.cc
+++ b/components/autofill/core/browser/metrics/autofill_metrics.cc
@@ -750,7 +750,7 @@
}
// Log the number of server cards that are enrolled with virtual cards.
- size_t virtual_card_enabled_card_count = base::ranges::count_if(
+ size_t virtual_card_enabled_card_count = std::ranges::count_if(
server_cards, [](const std::unique_ptr<CreditCard>& card) {
return card->virtual_card_enrollment_state() ==
CreditCard::VirtualCardEnrollmentState::kEnrolled;
diff --git a/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc b/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
index d8535ff8..d6495f2 100644
--- a/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
@@ -5267,8 +5267,8 @@
}
FormFieldData& GetFieldById(FieldGlobalId field) {
- auto it = base::ranges::find(test_api(form_).fields(), field,
- &FormFieldData::global_id);
+ auto it = std::ranges::find(test_api(form_).fields(), field,
+ &FormFieldData::global_id);
CHECK(it != form_.fields().end());
return *it;
}
diff --git a/components/autofill/core/browser/metrics/form_events/credit_card_form_event_logger.cc b/components/autofill/core/browser/metrics/form_events/credit_card_form_event_logger.cc
index 652cce026..25b7229 100644
--- a/components/autofill/core/browser/metrics/form_events/credit_card_form_event_logger.cc
+++ b/components/autofill/core/browser/metrics/form_events/credit_card_form_event_logger.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/metrics/form_events/credit_card_form_event_logger.h"
+#include <algorithm>
#include <string>
#include "base/containers/contains.h"
@@ -11,7 +12,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/types/cxx23_to_underlying.h"
#include "components/autofill/core/browser/data_manager/payments/payments_data_manager.h"
diff --git a/components/autofill/core/browser/metrics/form_interactions_ukm_logger_unittest.cc b/components/autofill/core/browser/metrics/form_interactions_ukm_logger_unittest.cc
index 10955969..714ea5b1 100644
--- a/components/autofill/core/browser/metrics/form_interactions_ukm_logger_unittest.cc
+++ b/components/autofill/core/browser/metrics/form_interactions_ukm_logger_unittest.cc
@@ -1685,7 +1685,7 @@
[](const testing::TestParamInfo<
LogFocusedComplexFormAtFormRemoveTest::ParamType>& info) {
std::string name = info.param.test_name;
- base::ranges::replace_if(
+ std::ranges::replace_if(
name, [](char c) { return !std::isalnum(c); }, '_');
return name;
});
diff --git a/components/autofill/core/browser/metrics/placeholder_metrics.cc b/components/autofill/core/browser/metrics/placeholder_metrics.cc
index bdd9aaba..d863491f 100644
--- a/components/autofill/core/browser/metrics/placeholder_metrics.cc
+++ b/components/autofill/core/browser/metrics/placeholder_metrics.cc
@@ -4,10 +4,11 @@
#include "components/autofill/core/browser/metrics/placeholder_metrics.h"
+#include <algorithm>
+
#include "base/containers/adapters.h"
#include "base/hash/hash.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/field_types.h"
diff --git a/components/autofill/core/browser/metrics/quality_metrics.cc b/components/autofill/core/browser/metrics/quality_metrics.cc
index 92f302b..27b1e62 100644
--- a/components/autofill/core/browser/metrics/quality_metrics.cc
+++ b/components/autofill/core/browser/metrics/quality_metrics.cc
@@ -98,8 +98,8 @@
base::TimeTicks interaction_time,
base::TimeTicks submission_time) {
size_t num_detected_field_types =
- base::ranges::count_if(form, &FieldHasMeaningfulPossibleFieldTypes,
- &std::unique_ptr<AutofillField>::operator*);
+ std::ranges::count_if(form, &FieldHasMeaningfulPossibleFieldTypes,
+ &std::unique_ptr<AutofillField>::operator*);
bool form_has_autofilled_fields = std::ranges::any_of(
form, [](const auto& field) { return field->is_autofilled(); });
bool has_observed_one_time_code_field =
diff --git a/components/autofill/core/browser/metrics/quality_metrics_filling.cc b/components/autofill/core/browser/metrics/quality_metrics_filling.cc
index 4c5405f..5930dfe 100644
--- a/components/autofill/core/browser/metrics/quality_metrics_filling.cc
+++ b/components/autofill/core/browser/metrics/quality_metrics_filling.cc
@@ -4,9 +4,10 @@
#include "components/autofill/core/browser/metrics/quality_metrics_filling.h"
+#include <algorithm>
+
#include "base/containers/fixed_flat_set.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/browser/metrics/autofill_metrics_utils.h"
diff --git a/components/autofill/core/browser/metrics/stored_profile_metrics.cc b/components/autofill/core/browser/metrics/stored_profile_metrics.cc
index 435868b..d023dc1b 100644
--- a/components/autofill/core/browser/metrics/stored_profile_metrics.cc
+++ b/components/autofill/core/browser/metrics/stored_profile_metrics.cc
@@ -4,10 +4,10 @@
#include "components/autofill/core/browser/metrics/stored_profile_metrics.h"
+#include <algorithm>
#include <functional>
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "components/autofill/core/browser/data_model/autofill_profile_comparator.h"
#include "components/autofill/core/browser/field_types.h"
@@ -94,10 +94,10 @@
// profile.
base::UmaHistogramCounts100(
"Autofill.Leipzig.Duplication.NumberOfLocalSupersetProfilesOnStartup",
- base::ranges::count_if(profiles.begin(), account_profiles.begin(),
- [&](const AutofillProfile* local_profile) {
- return is_account_superset(local_profile);
- }));
+ std::ranges::count_if(profiles.begin(), account_profiles.begin(),
+ [&](const AutofillProfile* local_profile) {
+ return is_account_superset(local_profile);
+ }));
}
void LogStoredProfileCountWithAlternativeName(
diff --git a/components/autofill/core/browser/metrics/suggestions_list_metrics.cc b/components/autofill/core/browser/metrics/suggestions_list_metrics.cc
index fbbd793..c8927aa 100644
--- a/components/autofill/core/browser/metrics/suggestions_list_metrics.cc
+++ b/components/autofill/core/browser/metrics/suggestions_list_metrics.cc
@@ -4,10 +4,11 @@
#include "components/autofill/core/browser/metrics/suggestions_list_metrics.h"
+#include <algorithm>
+
#include "base/metrics/histogram_functions.h"
#include "base/metrics/user_metrics.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "components/autofill/core/browser/filling/filling_product.h"
#include "components/autofill/core/browser/metrics/autofill_metrics.h"
diff --git a/components/autofill/core/browser/ml_model/field_classification_model_encoder.cc b/components/autofill/core/browser/ml_model/field_classification_model_encoder.cc
index ef13e94..bd194cd 100644
--- a/components/autofill/core/browser/ml_model/field_classification_model_encoder.cc
+++ b/components/autofill/core/browser/ml_model/field_classification_model_encoder.cc
@@ -128,7 +128,7 @@
output.emplace_back(cls_token());
for (int feature : encoding_parameters_.features()) {
- base::ranges::move(encode(feature), std::back_inserter(output));
+ std::ranges::move(encode(feature), std::back_inserter(output));
}
// Pad the remaining space, if any, with zeroes.
@@ -170,7 +170,7 @@
output.emplace_back(form_cls_token());
for (int feature : encoding_parameters_.form_features()) {
- base::ranges::move(encode(feature), std::back_inserter(output));
+ std::ranges::move(encode(feature), std::back_inserter(output));
}
// Pad the remaining space, if any, with zeroes.
diff --git a/components/autofill/core/browser/ml_model/field_classification_model_executor.cc b/components/autofill/core/browser/ml_model/field_classification_model_executor.cc
index 32dadc2..493eea8 100644
--- a/components/autofill/core/browser/ml_model/field_classification_model_executor.cc
+++ b/components/autofill/core/browser/ml_model/field_classification_model_executor.cc
@@ -9,9 +9,9 @@
#include "components/autofill/core/browser/ml_model/field_classification_model_executor.h"
+#include <algorithm>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/ml_model/field_classification_model_encoder.h"
#include "third_party/tflite/src/tensorflow/lite/kernels/internal/tensor_ctypes.h"
@@ -42,7 +42,7 @@
empty_field);
for (size_t i = 0; i < fields_count; ++i) {
- base::ranges::transform(
+ std::ranges::transform(
input[i], encoded_input[i].begin(),
[](FieldClassificationModelEncoder::TokenId token_id) {
return token_id.value();
@@ -50,9 +50,9 @@
}
// Populate tensors with the vectorized field labels.
for (size_t i = 0; i < maximum_number_of_fields; ++i) {
- base::ranges::copy(encoded_input[i],
- tflite::GetTensorData<float>(input_tensors[0]) +
- i * output_sequence_length);
+ std::ranges::copy(encoded_input[i],
+ tflite::GetTensorData<float>(input_tensors[0]) +
+ i * output_sequence_length);
}
}
// `input_tensors[1]` is a boolean mask of shape
@@ -87,8 +87,8 @@
model_predictions[i].resize(num_outputs);
const float* data_bgn =
tflite::GetTensorData<float>(output_tensors[0]) + i * num_outputs;
- base::ranges::copy(data_bgn, data_bgn + num_outputs,
- model_predictions[i].begin());
+ std::ranges::copy(data_bgn, data_bgn + num_outputs,
+ model_predictions[i].begin());
}
return model_predictions;
}
diff --git a/components/autofill/core/browser/ml_model/field_classification_model_handler.cc b/components/autofill/core/browser/ml_model/field_classification_model_handler.cc
index 0f77662be..8218d52 100644
--- a/components/autofill/core/browser/ml_model/field_classification_model_handler.cc
+++ b/components/autofill/core/browser/ml_model/field_classification_model_handler.cc
@@ -10,7 +10,6 @@
#include "base/barrier_callback.h"
#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/browser/form_structure.h"
#include "components/autofill/core/browser/heuristic_source.h"
@@ -47,7 +46,7 @@
size_t num_fields,
float confidence_threshold) {
for (size_t i = 0; i < num_fields; i++) {
- if (base::ranges::max(output[i]) < confidence_threshold) {
+ if (std::ranges::max(output[i]) < confidence_threshold) {
return false;
}
}
@@ -212,8 +211,7 @@
std::pair<FieldType, float> FieldClassificationModelHandler::GetMostLikelyType(
const std::vector<float>& model_output) const {
CHECK(state_);
- int max_index =
- base::ranges::max_element(model_output) - model_output.begin();
+ int max_index = std::ranges::max_element(model_output) - model_output.begin();
CHECK_LT(max_index, state_->metadata.output_type_size());
if (!state_->metadata.postprocessing_parameters()
.has_confidence_threshold_per_field() ||
diff --git a/components/autofill/core/browser/payments/autofill_offer_manager.cc b/components/autofill/core/browser/payments/autofill_offer_manager.cc
index 95ec7e47..0feaf8f 100644
--- a/components/autofill/core/browser/payments/autofill_offer_manager.cc
+++ b/components/autofill/core/browser/payments/autofill_offer_manager.cc
@@ -4,10 +4,11 @@
#include "components/autofill/core/browser/payments/autofill_offer_manager.h"
+#include <ranges>
+
#include "base/check_deref.h"
#include "base/containers/contains.h"
#include "base/functional/bind.h"
-#include "base/ranges/ranges.h"
#include "components/autofill/core/browser/data_manager/payments/payments_data_manager.h"
#include "components/autofill/core/browser/data_manager/personal_data_manager.h"
#include "components/autofill/core/browser/data_model/autofill_offer_data.h"
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.cc b/components/autofill/core/browser/payments/credit_card_access_manager.cc
index d2fedc1..4d9e332 100644
--- a/components/autofill/core/browser/payments/credit_card_access_manager.cc
+++ b/components/autofill/core/browser/payments/credit_card_access_manager.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/payments/credit_card_access_manager.h"
+#include <algorithm>
#include <functional>
#include <memory>
#include <set>
@@ -14,7 +15,6 @@
#include "base/check_deref.h"
#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
#include "build/build_config.h"
@@ -1571,7 +1571,7 @@
card_record_type == CreditCard::RecordType::kMaskedServerCard);
std::vector<CardUnmaskChallengeOption>& challenge_options =
risk_based_authentication_response_.card_unmask_challenge_options;
- auto card_unmask_challenge_options_it = base::ranges::find(
+ auto card_unmask_challenge_options_it = std::ranges::find(
challenge_options,
CardUnmaskChallengeOption::ChallengeOptionId(challenge_id),
&CardUnmaskChallengeOption::id);
diff --git a/components/autofill/core/browser/payments/credit_card_otp_authenticator_unittest.cc b/components/autofill/core/browser/payments/credit_card_otp_authenticator_unittest.cc
index b8da7b4..072ab12 100644
--- a/components/autofill/core/browser/payments/credit_card_otp_authenticator_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_otp_authenticator_unittest.cc
@@ -989,7 +989,7 @@
if (MetadataEnabled() && CardNameAvailable() && CardArtAvailable()) {
EXPECT_NE(
signals.end(),
- base::ranges::find(
+ std::ranges::find(
signals,
ClientBehaviorConstants::kShowingCardArtImageAndCardProductName));
} else {
@@ -1059,8 +1059,8 @@
std::vector<ClientBehaviorConstants> signals =
payments_network_interface().unmask_request()->client_behavior_signals;
- EXPECT_EQ(base::ranges::find(signals,
- ClientBehaviorConstants::kShowingCardBenefits) !=
+ EXPECT_EQ(std::ranges::find(signals,
+ ClientBehaviorConstants::kShowingCardBenefits) !=
signals.end(),
IsCreditCardBenefitsEnabled());
}
diff --git a/components/autofill/core/browser/payments/credit_card_risk_based_authenticator_unittest.cc b/components/autofill/core/browser/payments/credit_card_risk_based_authenticator_unittest.cc
index 76f9316..f437b2a 100644
--- a/components/autofill/core/browser/payments/credit_card_risk_based_authenticator_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_risk_based_authenticator_unittest.cc
@@ -505,7 +505,7 @@
if (MetadataEnabled() && CardNameAvailable() && CardArtAvailable()) {
EXPECT_NE(
signals.end(),
- base::ranges::find(
+ std::ranges::find(
signals,
ClientBehaviorConstants::kShowingCardArtImageAndCardProductName));
} else {
@@ -575,8 +575,8 @@
std::vector<ClientBehaviorConstants> signals =
payments_network_interface()->unmask_request()->client_behavior_signals;
- EXPECT_EQ(base::ranges::find(signals,
- ClientBehaviorConstants::kShowingCardBenefits) !=
+ EXPECT_EQ(std::ranges::find(signals,
+ ClientBehaviorConstants::kShowingCardBenefits) !=
signals.end(),
IsCreditCardBenefitsEnabled());
}
diff --git a/components/autofill/core/browser/payments/full_card_request_unittest.cc b/components/autofill/core/browser/payments/full_card_request_unittest.cc
index 0f35bfe..7142d9cd 100644
--- a/components/autofill/core/browser/payments/full_card_request_unittest.cc
+++ b/components/autofill/core/browser/payments/full_card_request_unittest.cc
@@ -793,7 +793,7 @@
if (MetadataEnabled() && CardNameAvailable() && CardArtAvailable()) {
EXPECT_NE(
signals.end(),
- base::ranges::find(
+ std::ranges::find(
signals,
ClientBehaviorConstants::kShowingCardArtImageAndCardProductName));
} else {
@@ -857,8 +857,8 @@
ASSERT_TRUE(request().GetShouldUnmaskCardForTesting());
std::vector<ClientBehaviorConstants> signals =
request().GetUnmaskRequestDetailsForTesting()->client_behavior_signals;
- EXPECT_EQ(base::ranges::find(signals,
- ClientBehaviorConstants::kShowingCardBenefits) !=
+ EXPECT_EQ(std::ranges::find(signals,
+ ClientBehaviorConstants::kShowingCardBenefits) !=
signals.end(),
IsCreditCardBenefitsEnabled());
}
diff --git a/components/autofill/core/browser/payments/iban_save_manager.cc b/components/autofill/core/browser/payments/iban_save_manager.cc
index 9d10210..1881c91d 100644
--- a/components/autofill/core/browser/payments/iban_save_manager.cc
+++ b/components/autofill/core/browser/payments/iban_save_manager.cc
@@ -4,8 +4,9 @@
#include "components/autofill/core/browser/payments/iban_save_manager.h"
+#include <algorithm>
+
#include "base/check_deref.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/data_manager/personal_data_manager.h"
#include "components/autofill/core/browser/data_model/iban.h"
diff --git a/components/autofill/core/browser/payments/payments_requests/payments_request.cc b/components/autofill/core/browser/payments/payments_requests/payments_request.cc
index 200f9ae..da438be 100644
--- a/components/autofill/core/browser/payments/payments_requests/payments_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/payments_request.cc
@@ -84,7 +84,7 @@
for (ClientBehaviorConstants signal : client_behavior_signals) {
active_client_signals.Append(base::to_underlying(signal));
}
- base::ranges::sort(active_client_signals);
+ std::ranges::sort(active_client_signals);
chrome_user_context.Set("client_behavior_signals",
std::move(active_client_signals));
}
diff --git a/components/autofill/core/browser/payments/payments_util.cc b/components/autofill/core/browser/payments/payments_util.cc
index f03b905..5c294fc 100644
--- a/components/autofill/core/browser/payments/payments_util.cc
+++ b/components/autofill/core/browser/payments/payments_util.cc
@@ -4,10 +4,10 @@
#include "components/autofill/core/browser/payments/payments_util.h"
+#include <algorithm>
#include <string_view>
#include "base/check_op.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "components/autofill/core/browser/data_manager/payments/payments_data_manager.h"
#include "components/autofill/core/browser/payments/payments_customer_data.h"
diff --git a/components/autofill/core/browser/strike_databases/strike_database_integrator_base.cc b/components/autofill/core/browser/strike_databases/strike_database_integrator_base.cc
index 426ba597..30f1223f 100644
--- a/components/autofill/core/browser/strike_databases/strike_database_integrator_base.cc
+++ b/components/autofill/core/browser/strike_databases/strike_database_integrator_base.cc
@@ -113,7 +113,7 @@
}
size_t StrikeDatabaseIntegratorBase::CountEntries() const {
- return base::ranges::count_if(GetStrikeCache(), [&](const auto& entry) {
+ return std::ranges::count_if(GetStrikeCache(), [&](const auto& entry) {
return strike_database_->GetPrefixFromKey(entry.first) ==
GetProjectPrefix();
});
diff --git a/components/autofill/core/browser/studies/autofill_experiments.cc b/components/autofill/core/browser/studies/autofill_experiments.cc
index ed1992a..869cf5c 100644
--- a/components/autofill/core/browser/studies/autofill_experiments.cc
+++ b/components/autofill/core/browser/studies/autofill_experiments.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/studies/autofill_experiments.h"
+#include <algorithm>
#include <string>
#include <string_view>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/metrics/field_trial_params.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -230,7 +230,7 @@
std::string country_code = base::ToUpperASCII(user_country);
auto* const* country_iter =
- base::ranges::find(kAutofillUpstreamLaunchedCountries, country_code);
+ std::ranges::find(kAutofillUpstreamLaunchedCountries, country_code);
if (country_iter == std::end(kAutofillUpstreamLaunchedCountries)) {
// |country_code| was not found in the list of launched countries.
autofill_metrics::LogCardUploadEnabledMetric(
diff --git a/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc b/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc
index 592adf34..cf5575d0 100644
--- a/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc
+++ b/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc
@@ -17,7 +17,6 @@
#include "base/i18n/case_conversion.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -551,7 +550,7 @@
std::vector<std::vector<Suggestion::Text>> labels = CreateSuggestionLabels(
profiles, field_types, trigger_field_type, app_locale);
const bool contains_profile_related_fields =
- base::ranges::count_if(field_types, [](FieldType field_type) {
+ std::ranges::count_if(field_types, [](FieldType field_type) {
FieldTypeGroup field_type_group = GroupTypeOfFieldType(field_type);
return field_type_group == FieldTypeGroup::kName ||
field_type_group == FieldTypeGroup::kAddress ||
@@ -731,8 +730,8 @@
}
if (suggestions.size() > 0) {
// TODO(crbug.com/381994105): Consider adding undo.
- base::ranges::move(GetAddressFooterSuggestions(/*is_autofilled=*/false),
- std::back_inserter(suggestions));
+ std::ranges::move(GetAddressFooterSuggestions(/*is_autofilled=*/false),
+ std::back_inserter(suggestions));
}
return suggestions;
}
@@ -773,8 +772,8 @@
if (suggestions.empty()) {
return suggestions;
}
- base::ranges::move(GetAddressFooterSuggestions(trigger_field.is_autofilled()),
- std::back_inserter(suggestions));
+ std::ranges::move(GetAddressFooterSuggestions(trigger_field.is_autofilled()),
+ std::back_inserter(suggestions));
return suggestions;
}
diff --git a/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc b/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc
index c6a8164..6533560 100644
--- a/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc
+++ b/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.h"
+#include <algorithm>
#include <functional>
#include <string>
#include <vector>
@@ -15,7 +16,6 @@
#include "base/i18n/case_conversion.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -757,7 +757,7 @@
if (std::map<std::string, const AutofillOfferData*> card_linked_offers_map =
GetCardLinkedOffers(client);
!card_linked_offers_map.empty()) {
- base::ranges::stable_sort(
+ std::ranges::stable_sort(
available_cards,
[&card_linked_offers_map](const CreditCard* a, const CreditCard* b) {
return base::Contains(card_linked_offers_map, a->guid()) &&
@@ -930,7 +930,7 @@
bool display_gpay_logo = false;
suggestions.push_back(
CreateSaveAndFillSuggestion(client, display_gpay_logo));
- base::ranges::move(
+ std::ranges::move(
GetCreditCardFooterSuggestions(
should_show_scan_credit_card, should_show_cards_from_account,
trigger_field.is_autofilled(), display_gpay_logo),
@@ -1043,7 +1043,7 @@
// Find the ranking of the card in the old and new algorithm and
// mark if they are ranked higher, lower, or the same.
size_t ranking_legacy_algorithm =
- base::ranges::find(cards_ranked_by_legacy_algorithm, credit_card) -
+ std::ranges::find(cards_ranked_by_legacy_algorithm, credit_card) -
cards_ranked_by_legacy_algorithm.begin();
autofill_metrics::SuggestionRankingContext::RelativePosition
ranking_difference = autofill_metrics::SuggestionRankingContext::
@@ -1067,7 +1067,7 @@
const bool display_gpay_logo = std::ranges::none_of(
cards_to_suggest,
[](const CreditCard& card) { return CreditCard::IsLocalCard(&card); });
- base::ranges::move(
+ std::ranges::move(
GetCreditCardFooterSuggestions(
should_show_scan_credit_card, should_show_cards_from_account,
trigger_field.is_autofilled(), display_gpay_logo),
@@ -1133,7 +1133,7 @@
return suggestions;
}
- base::ranges::move(
+ std::ranges::move(
GetCreditCardFooterSuggestions(/*should_show_scan_credit_card=*/false,
/*should_show_cards_from_account=*/false,
trigger_field.is_autofilled(),
diff --git a/components/autofill/core/browser/test_utils/autofill_test_utils.cc b/components/autofill/core/browser/test_utils/autofill_test_utils.cc
index c4f56796..eabac9d9 100644
--- a/components/autofill/core/browser/test_utils/autofill_test_utils.cc
+++ b/components/autofill/core/browser/test_utils/autofill_test_utils.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/test_utils/autofill_test_utils.h"
+#include <algorithm>
#include <cstdint>
#include <iterator>
#include <string>
@@ -11,7 +12,6 @@
#include "base/functional/overloaded.h"
#include "base/memory/raw_ptr.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -1031,7 +1031,7 @@
AutofillQueryResponse_FormSuggestion* form_suggestion) {
std::vector<FieldPrediction> field_predictions;
field_predictions.reserve(field_types.size());
- base::ranges::transform(
+ std::ranges::transform(
field_types, std::back_inserter(field_predictions),
[](FieldType field_type) { return CreateFieldPrediction(field_type); });
return AddFieldPredictionsToForm(field_data, field_predictions,
diff --git a/components/autofill/core/browser/test_utils/test_profiles.cc b/components/autofill/core/browser/test_utils/test_profiles.cc
index 8c662628..b418fde 100644
--- a/components/autofill/core/browser/test_utils/test_profiles.cc
+++ b/components/autofill/core/browser/test_utils/test_profiles.cc
@@ -16,7 +16,7 @@
bool finalize) {
DCHECK(profile);
- base::ranges::for_each(
+ std::ranges::for_each(
profile_test_data, [&](const ProfileTestData& test_data) {
profile->SetRawInfoWithVerificationStatus(
test_data.field_type, base::UTF8ToUTF16(test_data.value),
@@ -38,7 +38,7 @@
// Make a copy of the test data with all verification statuses replaced with
// 'kObserved'.
std::vector<ProfileTestData> observed_test_data;
- base::ranges::for_each(test_data, [&](const ProfileTestData& entry) {
+ std::ranges::for_each(test_data, [&](const ProfileTestData& entry) {
observed_test_data.emplace_back(ProfileTestData{
entry.field_type, entry.value, VerificationStatus::kObserved});
});
diff --git a/components/autofill/core/browser/test_utils/test_profiles.h b/components/autofill/core/browser/test_utils/test_profiles.h
index 4885ae1f..fe2ba5b 100644
--- a/components/autofill/core/browser/test_utils/test_profiles.h
+++ b/components/autofill/core/browser/test_utils/test_profiles.h
@@ -5,7 +5,8 @@
#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_UTILS_TEST_PROFILES_H_
#define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_UTILS_TEST_PROFILES_H_
-#include "base/ranges/ranges.h"
+#include <ranges>
+
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/data_model/autofill_profile.h"
#include "components/autofill/core/browser/data_model/autofill_structured_address_test_utils.h"
diff --git a/components/autofill/core/browser/ui/addresses/autofill_address_util.cc b/components/autofill/core/browser/ui/addresses/autofill_address_util.cc
index ae58ac1..8af5133 100644
--- a/components/autofill/core/browser/ui/addresses/autofill_address_util.cc
+++ b/components/autofill/core/browser/ui/addresses/autofill_address_util.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/ui/addresses/autofill_address_util.h"
+#include <algorithm>
#include <iterator>
#include <memory>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/memory/ptr_util.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -87,7 +87,7 @@
country.address_format_extensions()) {
// Find the location of `rule.placed_after` in `components`.
// `components.field` is only valid if `components.literal.empty()`.
- auto prev_component = base::ranges::find_if(
+ auto prev_component = std::ranges::find_if(
components, [&rule](const AutofillAddressUIComponent& component) {
return component.literal.empty() &&
component.field == rule.placed_after;
@@ -312,11 +312,11 @@
}
};
- base::ranges::sort(differences_for_ui,
- [get_priority](const ProfileValueDifference& a,
- const ProfileValueDifference& b) {
- return get_priority(a.type) < get_priority(b.type);
- });
+ std::ranges::sort(differences_for_ui,
+ [get_priority](const ProfileValueDifference& a,
+ const ProfileValueDifference& b) {
+ return get_priority(a.type) < get_priority(b.type);
+ });
return differences_for_ui;
}
diff --git a/components/autofill/core/browser/ui/addresses/autofill_address_util_unittest.cc b/components/autofill/core/browser/ui/addresses/autofill_address_util_unittest.cc
index 8b137f5d..4d1d5dde 100644
--- a/components/autofill/core/browser/ui/addresses/autofill_address_util_unittest.cc
+++ b/components/autofill/core/browser/ui/addresses/autofill_address_util_unittest.cc
@@ -64,7 +64,7 @@
// Expect to find a line consisting solely of a state field.
// Because `include_literals=false`, accessing `.field` is valid.
- auto state_line = base::ranges::find_if(lines, [](const auto& line) {
+ auto state_line = std::ranges::find_if(lines, [](const auto& line) {
return line.size() == 1 &&
line[0].field == i18n::TypeForField(
::i18n::addressinput::AddressField::ADMIN_AREA);
diff --git a/components/autofill/core/browser/ui/autofill_external_delegate.cc b/components/autofill/core/browser/ui/autofill_external_delegate.cc
index a592cff..05b08ef 100644
--- a/components/autofill/core/browser/ui/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/ui/autofill_external_delegate.cc
@@ -78,7 +78,7 @@
if (test_addresses.empty()) {
return std::nullopt;
}
- auto it = base::ranges::find(test_addresses, guid, &AutofillProfile::guid);
+ auto it = std::ranges::find(test_addresses, guid, &AutofillProfile::guid);
if (it == test_addresses.end()) {
return std::nullopt;
}
@@ -520,11 +520,11 @@
}
}
- if (base::ranges::any_of(shown_suggestion_types,
- [](const SuggestionType& type) {
- return GetFillingProductFromSuggestionType(type) ==
- FillingProduct::kAutofillAi;
- })) {
+ if (std::ranges::any_of(shown_suggestion_types,
+ [](const SuggestionType& type) {
+ return GetFillingProductFromSuggestionType(type) ==
+ FillingProduct::kAutofillAi;
+ })) {
if (auto* autofill_ai_delegate =
manager_->client().GetAutofillAiDelegate()) {
autofill_ai_delegate->OnSuggestionsShown(
diff --git a/components/autofill/core/browser/ui/payments/card_unmask_authentication_selection_dialog_controller_impl.cc b/components/autofill/core/browser/ui/payments/card_unmask_authentication_selection_dialog_controller_impl.cc
index 0ade5dd..8bfbafb 100644
--- a/components/autofill/core/browser/ui/payments/card_unmask_authentication_selection_dialog_controller_impl.cc
+++ b/components/autofill/core/browser/ui/payments/card_unmask_authentication_selection_dialog_controller_impl.cc
@@ -133,8 +133,8 @@
// TODO(crbug.com/40247983): Remove this lambda once we refactor
// `SetSelectedChallengeOptionId()` to `SetSelectedChallengeOptionForId()`.
auto selected_challenge_option =
- base::ranges::find(challenge_options_, selected_challenge_option_id_,
- &CardUnmaskChallengeOption::id);
+ std::ranges::find(challenge_options_, selected_challenge_option_id_,
+ &CardUnmaskChallengeOption::id);
CHECK(selected_challenge_option != challenge_options_.end());
selected_challenge_option_type_ = (*selected_challenge_option).type;
@@ -228,8 +228,8 @@
// TODO(crbug.com/40247983): Remove this lambda once we refactor
// `SetSelectedChallengeOptionId()` to `SetSelectedChallengeOptionForId()`.
auto selected_challenge_option =
- base::ranges::find(challenge_options_, selected_challenge_option_id_,
- &CardUnmaskChallengeOption::id);
+ std::ranges::find(challenge_options_, selected_challenge_option_id_,
+ &CardUnmaskChallengeOption::id);
switch (selected_challenge_option->type) {
case CardUnmaskChallengeOptionType::kSmsOtp:
case CardUnmaskChallengeOptionType::kEmailOtp:
diff --git a/components/autofill/core/browser/webdata/payments/autofill_wallet_credential_sync_bridge.cc b/components/autofill/core/browser/webdata/payments/autofill_wallet_credential_sync_bridge.cc
index d0c1e7f..ec0beeb 100644
--- a/components/autofill/core/browser/webdata/payments/autofill_wallet_credential_sync_bridge.cc
+++ b/components/autofill/core/browser/webdata/payments/autofill_wallet_credential_sync_bridge.cc
@@ -4,11 +4,11 @@
#include "components/autofill/core/browser/webdata/payments/autofill_wallet_credential_sync_bridge.h"
+#include <algorithm>
#include <utility>
#include "base/check.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "components/autofill/core/browser/webdata/autofill_change.h"
#include "components/autofill/core/browser/webdata/autofill_sync_metadata_table.h"
@@ -158,11 +158,11 @@
AutofillWalletCredentialSyncBridge::GetDataForCommit(
StorageKeyList storage_keys) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- base::ranges::sort(storage_keys);
+ std::ranges::sort(storage_keys);
std::vector<std::unique_ptr<ServerCvc>> filtered_server_cvc_list;
for (std::unique_ptr<ServerCvc>& server_cvc_from_list :
GetAutofillTable()->GetAllServerCvcs()) {
- if (base::ranges::binary_search(
+ if (std::ranges::binary_search(
storage_keys,
base::NumberToString(server_cvc_from_list->instrument_id))) {
filtered_server_cvc_list.push_back(std::move(server_cvc_from_list));
diff --git a/components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.cc b/components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.cc
index 7299dff..822793f 100644
--- a/components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.cc
+++ b/components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.cc
@@ -4,6 +4,7 @@
#include "components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.h"
+#include <algorithm>
#include <utility>
#include "base/base64.h"
@@ -11,7 +12,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "components/autofill/core/browser/data_model/bank_account.h"
#include "components/autofill/core/browser/data_model/credit_card.h"
@@ -704,8 +704,8 @@
const std::vector<CreditCard>& new_data) {
for (const CreditCard& new_card : new_data) {
// Try to find the old card with same server id.
- auto old_data_iterator = base::ranges::find(old_data, new_card.server_id(),
- &CreditCard::server_id);
+ auto old_data_iterator = std::ranges::find(old_data, new_card.server_id(),
+ &CreditCard::server_id);
// No existing card with the same ID found.
if (old_data_iterator == old_data.end()) {
diff --git a/components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge.cc b/components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge.cc
index b9848f3..795f913 100644
--- a/components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge.cc
+++ b/components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge.cc
@@ -4,9 +4,9 @@
#include "components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge.h"
+#include <algorithm>
#include <utility>
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "components/autofill/core/browser/data_model/autofill_wallet_usage_data.h"
#include "components/autofill/core/browser/metrics/payments/wallet_usage_data_metrics.h"
@@ -144,10 +144,10 @@
AutofillWalletUsageDataSyncBridge::GetDataForCommit(
StorageKeyList storage_keys) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- base::ranges::sort(storage_keys);
+ std::ranges::sort(storage_keys);
auto filter_by_keys = base::BindRepeating(
[](const StorageKeyList& storage_keys, const std::string& usage_data_id) {
- return base::ranges::binary_search(storage_keys, usage_data_id);
+ return std::ranges::binary_search(storage_keys, usage_data_id);
},
storage_keys);
return GetDataAndFilter(filter_by_keys);
diff --git a/components/autofill/core/browser/webdata/payments/payments_autofill_table_unittest.cc b/components/autofill/core/browser/webdata/payments/payments_autofill_table_unittest.cc
index 4378c27..2d5aa199 100644
--- a/components/autofill/core/browser/webdata/payments/payments_autofill_table_unittest.cc
+++ b/components/autofill/core/browser/webdata/payments/payments_autofill_table_unittest.cc
@@ -1471,8 +1471,8 @@
for (const auto& data : virtual_card_usage_data) {
// Find output data with corresponding data.
- auto it = base::ranges::find(output_data, data.instrument_id(),
- &VirtualCardUsageData::instrument_id);
+ auto it = std::ranges::find(output_data, data.instrument_id(),
+ &VirtualCardUsageData::instrument_id);
// Expect to find a usage data match in the vector.
EXPECT_NE(it, output_data.end());
@@ -1641,7 +1641,7 @@
EXPECT_EQ(input_benefits.size(), output_benefits.size());
for (const auto& input_benefit : input_benefits) {
// Find input benefits in outputs.
- auto output_benefit_find_result = base::ranges::find(
+ auto output_benefit_find_result = std::ranges::find(
output_benefits, get_benefit_id(input_benefit), get_benefit_id);
EXPECT_NE(output_benefit_find_result, output_benefits.end());
EXPECT_EQ(input_benefit, *output_benefit_find_result);
diff --git a/components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc b/components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc
index 4537c76e..442bb10 100644
--- a/components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc
+++ b/components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc
@@ -4,11 +4,12 @@
#include "components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.h"
+#include <algorithm>
+
#include "base/base64.h"
#include "base/check.h"
#include "base/functional/overloaded.h"
#include "base/pickle.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -1040,7 +1041,7 @@
auto compare_equal = [](const Item* lhs, const Item* rhs) {
return lhs->Compare(*rhs) == 0;
};
- return !base::ranges::equal(old_ptrs, new_ptrs, compare_equal);
+ return !std::ranges::equal(old_ptrs, new_ptrs, compare_equal);
}
template bool AreAnyItemsDifferent<>(
diff --git a/components/autofill/core/common/autofill_data_validation.cc b/components/autofill/core/common/autofill_data_validation.cc
index cb58048..00850da 100644
--- a/components/autofill/core/common/autofill_data_validation.cc
+++ b/components/autofill/core/common/autofill_data_validation.cc
@@ -4,7 +4,8 @@
#include "components/autofill/core/common/autofill_data_validation.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/types/cxx23_to_underlying.h"
#include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/autofill_util.h"
diff --git a/components/autofill/core/common/dense_set_unittest.cc b/components/autofill/core/common/dense_set_unittest.cc
index f569f70..c1acdde 100644
--- a/components/autofill/core/common/dense_set_unittest.cc
+++ b/components/autofill/core/common/dense_set_unittest.cc
@@ -4,11 +4,11 @@
#include "components/autofill/core/common/dense_set.h"
+#include <algorithm>
#include <vector>
#include "base/logging.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -615,7 +615,7 @@
auto expect_equivalence = [&] {
EXPECT_EQ(dense_set.empty(), std_set.empty());
EXPECT_EQ(dense_set.size(), std_set.size());
- EXPECT_TRUE(base::ranges::equal(dense_set, std_set));
+ EXPECT_TRUE(std::ranges::equal(dense_set, std_set));
};
auto random_insert = [&] {
diff --git a/components/autofill/core/common/form_data.cc b/components/autofill/core/common/form_data.cc
index 236c1dd..0ddb89a1 100644
--- a/components/autofill/core/common/form_data.cc
+++ b/components/autofill/core/common/form_data.cc
@@ -118,9 +118,9 @@
// because we expect most inequalities to be due to them.
if (a.renderer_id() != b.renderer_id() ||
a.child_frames() != b.child_frames() ||
- !base::ranges::equal(a.fields(), b.fields(), {},
- &FormFieldData::renderer_id,
- &FormFieldData::renderer_id)) {
+ !std::ranges::equal(a.fields(), b.fields(), {},
+ &FormFieldData::renderer_id,
+ &FormFieldData::renderer_id)) {
return false;
}
@@ -128,7 +128,7 @@
a.name_attribute() != b.name_attribute() || a.url() != b.url() ||
a.action() != b.action() ||
a.likely_contains_captcha() != b.likely_contains_captcha() ||
- !base::ranges::equal(a.fields(), b.fields(), &FormFieldData::DeepEqual)) {
+ !std::ranges::equal(a.fields(), b.fields(), &FormFieldData::DeepEqual)) {
return false;
}
return true;
@@ -157,7 +157,7 @@
const FormFieldData* FormData::FindFieldByGlobalId(
const FieldGlobalId& global_id) const {
auto fields_it =
- base::ranges::find(fields(), global_id, &FormFieldData::global_id);
+ std::ranges::find(fields(), global_id, &FormFieldData::global_id);
// If the field is found, return a pointer to the field, otherwise return
// nullptr.
diff --git a/components/autofill/core/common/form_data_test_api.h b/components/autofill/core/common/form_data_test_api.h
index d3b89ba..7375d460 100644
--- a/components/autofill/core/common/form_data_test_api.h
+++ b/components/autofill/core/common/form_data_test_api.h
@@ -25,7 +25,7 @@
// Finds a field in the FormData by its name or id.
// Returns a pointer to the field if found, otherwise returns nullptr.
FormFieldData* FindFieldByNameForTest(std::u16string_view name_or_id) {
- auto it = base::ranges::find(fields(), name_or_id, &FormFieldData::name);
+ auto it = std::ranges::find(fields(), name_or_id, &FormFieldData::name);
return it != fields().end() ? &*it : nullptr;
}
diff --git a/components/autofill/core/common/signatures.cc b/components/autofill/core/common/signatures.cc
index 4df0f33..918c446 100644
--- a/components/autofill/core/common/signatures.cc
+++ b/components/autofill/core/common/signatures.cc
@@ -39,7 +39,7 @@
// If `input[i]` is a digit, find the range of consecutive digits starting
// at `i`. If this range is shorter than 5 characters append it to `result`.
- auto end_it = base::ranges::find_if_not(input.substr(i), IsDigit);
+ auto end_it = std::ranges::find_if_not(input.substr(i), IsDigit);
std::string_view digits = base::MakeStringPiece(input.begin() + i, end_it);
DCHECK(std::ranges::all_of(digits, IsDigit));
if (digits.size() < 5)
diff --git a/components/autofill/ios/browser/autofill_across_iframes_unittest.mm b/components/autofill/ios/browser/autofill_across_iframes_unittest.mm
index 0d97a9c..5a29e94 100644
--- a/components/autofill/ios/browser/autofill_across_iframes_unittest.mm
+++ b/components/autofill/ios/browser/autofill_across_iframes_unittest.mm
@@ -72,23 +72,23 @@
FormFieldData* GetFieldWithPlaceholder(const std::u16string& placeholder,
std::vector<FormFieldData>* fields) {
auto it =
- base::ranges::find(*fields, placeholder, &FormFieldData::placeholder);
+ std::ranges::find(*fields, placeholder, &FormFieldData::placeholder);
return it != fields->end() ? &(*it) : nullptr;
}
// Gets a mutable pointer to the first field with `id_attr` among `fields`.
FormFieldData* GetMutableFieldWithId(const std::string& id_attr,
std::vector<FormFieldData>* fields) {
- auto it = base::ranges::find(*fields, base::UTF8ToUTF16(id_attr),
- &FormFieldData::id_attribute);
+ auto it = std::ranges::find(*fields, base::UTF8ToUTF16(id_attr),
+ &FormFieldData::id_attribute);
return it != fields->end() ? &*it : nullptr;
}
// Gets a const pointer to the first field with `id_attr` among `fields`.
const FormFieldData* GetFieldWithId(const std::string& id_attr,
const std::vector<FormFieldData>& fields) {
- auto it = base::ranges::find(fields, base::UTF8ToUTF16(id_attr),
- &FormFieldData::id_attribute);
+ auto it = std::ranges::find(fields, base::UTF8ToUTF16(id_attr),
+ &FormFieldData::id_attribute);
return it != fields.end() ? &(*it) : nullptr;
}
@@ -1201,7 +1201,7 @@
ASSERT_EQ(form.fields().size(), 2u);
std::vector<FieldGlobalId> field_global_ids(form.fields().size());
- base::ranges::transform(
+ std::ranges::transform(
form.fields(), field_global_ids.begin(),
[](const FormFieldData& field) { return field.global_id(); });
@@ -1250,7 +1250,7 @@
ASSERT_EQ(form.fields().size(), 2u);
std::vector<FieldGlobalId> field_global_ids(form.fields().size());
- base::ranges::transform(
+ std::ranges::transform(
form.fields(), field_global_ids.begin(),
[](const FormFieldData& field) { return field.global_id(); });
@@ -1303,7 +1303,7 @@
ASSERT_EQ(form.fields().size(), 2u);
std::vector<FieldGlobalId> field_global_ids(form.fields().size());
- base::ranges::transform(
+ std::ranges::transform(
form.fields(), field_global_ids.begin(),
[](const FormFieldData& field) { return field.global_id(); });
diff --git a/components/autofill/ios/browser/autofill_agent.mm b/components/autofill/ios/browser/autofill_agent.mm
index f321f9b..cfcd4079 100644
--- a/components/autofill/ios/browser/autofill_agent.mm
+++ b/components/autofill/ios/browser/autofill_agent.mm
@@ -6,6 +6,7 @@
#import <UIKit/UIKit.h>
+#import <algorithm>
#import <cstdint>
#import <memory>
#import <optional>
@@ -26,7 +27,6 @@
#import "base/memory/weak_ptr.h"
#import "base/metrics/field_trial.h"
#import "base/metrics/histogram_functions.h"
-#import "base/ranges/algorithm.h"
#import "base/strings/string_number_conversions.h"
#import "base/strings/sys_string_conversions.h"
#import "base/strings/utf_string_conversions.h"
@@ -136,7 +136,7 @@
bool ContainsFocusableField(const FormData& form, FieldRendererId field_id) {
auto it =
- base::ranges::find(form.fields(), field_id, &FormFieldData::renderer_id);
+ std::ranges::find(form.fields(), field_id, &FormFieldData::renderer_id);
return it != form.fields().end() && it->is_focusable();
}
diff --git a/components/autofill/ios/browser/autofill_driver_ios.mm b/components/autofill/ios/browser/autofill_driver_ios.mm
index 3cb91ee..84942fe 100644
--- a/components/autofill/ios/browser/autofill_driver_ios.mm
+++ b/components/autofill/ios/browser/autofill_driver_ios.mm
@@ -629,15 +629,15 @@
if (FormStructure* form =
GetAutofillManager().FindCachedFormById(synthetic_global_id)) {
std::set<FieldRendererId> form_fields;
- base::ranges::transform(form->fields(),
- std::inserter(form_fields, form_fields.begin()),
- [](const std::unique_ptr<AutofillField>& field) {
- return field->renderer_id();
- });
+ std::ranges::transform(form->fields(),
+ std::inserter(form_fields, form_fields.begin()),
+ [](const std::unique_ptr<AutofillField>& field) {
+ return field->renderer_id();
+ });
// If the synthetic form fields are a subset of the removed fields, it
// means that all the synthetic form fields were removed.
const bool is_deleted =
- base::ranges::includes(removed_unowned_fields, form_fields);
+ std::ranges::includes(removed_unowned_fields, form_fields);
if (is_deleted) {
forms_to_report.emplace_back(synthetic_global_id);
}
diff --git a/components/autofill/ios/browser/autofill_xhr_sumission_detection_unittest.mm b/components/autofill/ios/browser/autofill_xhr_sumission_detection_unittest.mm
index d94e87f..75d7335 100644
--- a/components/autofill/ios/browser/autofill_xhr_sumission_detection_unittest.mm
+++ b/components/autofill/ios/browser/autofill_xhr_sumission_detection_unittest.mm
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#import <algorithm>
#import <optional>
#import <set>
-#import "base/ranges/algorithm.h"
#import "base/test/metrics/histogram_tester.h"
#import "base/test/scoped_feature_list.h"
#import "base/test/task_environment.h"
diff --git a/components/autofill/ios/browser/form_fetch_batcher.mm b/components/autofill/ios/browser/form_fetch_batcher.mm
index 16d533e..2ec8256 100644
--- a/components/autofill/ios/browser/form_fetch_batcher.mm
+++ b/components/autofill/ios/browser/form_fetch_batcher.mm
@@ -4,11 +4,12 @@
#import "components/autofill/ios/browser/form_fetch_batcher.h"
+#include <algorithm>
+
#include "base/functional/bind.h"
#import "base/memory/weak_ptr.h"
#import "base/metrics/histogram_functions.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#import "base/task/task_runner.h"
#import "base/time/time.h"
#import "components/autofill/core/common/form_data.h"
@@ -30,7 +31,7 @@
}
std::vector<FormData> filtered_forms;
- base::ranges::copy_if(
+ std::ranges::copy_if(
*forms, std::back_inserter(filtered_forms),
[&](const std::u16string& name) { return name == *form_name; },
&FormData::name);
diff --git a/components/autofill_ai/core/browser/suggestion/autofill_ai_model_executor_impl.cc b/components/autofill_ai/core/browser/suggestion/autofill_ai_model_executor_impl.cc
index b9ff4fa7..19239172 100644
--- a/components/autofill_ai/core/browser/suggestion/autofill_ai_model_executor_impl.cc
+++ b/components/autofill_ai/core/browser/suggestion/autofill_ai_model_executor_impl.cc
@@ -179,7 +179,7 @@
// Ensure that the predicted value actually is one of the select
// options.
- auto predicted_select_option_it = base::ranges::find(
+ auto predicted_select_option_it = std::ranges::find(
field.options(), predicted_value, &autofill::SelectOption::text);
if (predicted_select_option_it == field.options().end()) {
continue;
diff --git a/components/base32/base32_fuzzer.cc b/components/base32/base32_fuzzer.cc
index 475eab3..335c397 100644
--- a/components/base32/base32_fuzzer.cc
+++ b/components/base32/base32_fuzzer.cc
@@ -2,17 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/base32/base32.h"
+
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <limits>
#include <string>
#include <vector>
#include "base/check.h"
#include "base/containers/span.h"
-#include "base/ranges/algorithm.h"
-#include "components/base32/base32.h"
base32::Base32EncodePolicy GetBase32EncodePolicyFromUint8(uint8_t value) {
// Dummy switch to detect changes to the enum definition.
@@ -37,6 +38,6 @@
const base::span<const uint8_t> input_bytes(data + 1, size - 1));
std::string encoded_string = base32::Base32Encode(input_bytes, encode_policy);
std::vector<uint8_t> decoded_bytes = base32::Base32Decode(encoded_string);
- CHECK(base::ranges::equal(input_bytes, decoded_bytes));
+ CHECK(std::ranges::equal(input_bytes, decoded_bytes));
return 0;
}
diff --git a/components/base32/base32_unittest.cc b/components/base32/base32_unittest.cc
index 37e09eb..3cb4f30 100644
--- a/components/base32/base32_unittest.cc
+++ b/components/base32/base32_unittest.cc
@@ -6,10 +6,10 @@
#include <stdint.h>
+#include <algorithm>
#include <array>
#include <string>
-#include "base/ranges/algorithm.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base32 {
@@ -29,7 +29,7 @@
Base32Encode(test_subspan.first(i), Base32EncodePolicy::OMIT_PADDING);
EXPECT_EQ(expected[i], encoded_output);
auto decoded_output = Base32Decode(encoded_output);
- EXPECT_TRUE(base::ranges::equal(test_subspan.first(i), decoded_output));
+ EXPECT_TRUE(std::ranges::equal(test_subspan.first(i), decoded_output));
}
}
@@ -47,7 +47,7 @@
std::string encoded_output = Base32Encode(test_subspan.first(i));
EXPECT_EQ(expected[i], encoded_output);
std::vector<uint8_t> decoded_output = Base32Decode(encoded_output);
- EXPECT_TRUE(base::ranges::equal(test_subspan.first(i), decoded_output));
+ EXPECT_TRUE(std::ranges::equal(test_subspan.first(i), decoded_output));
}
}
@@ -63,7 +63,7 @@
EXPECT_EQ("D4S6DSV2J743QJZEQMH4UYHEYK7KRQ5JIQOCPMFUHZVJNFGHXACA",
encoded_output);
std::vector<uint8_t> decoded_output = Base32Decode(encoded_output);
- EXPECT_TRUE(base::ranges::equal(test_span, decoded_output));
+ EXPECT_TRUE(std::ranges::equal(test_span, decoded_output));
}
} // namespace
diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
index f7b39792..63464e5f 100644
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <algorithm>
#include <array>
#include <memory>
#include <unordered_set>
@@ -19,7 +20,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -174,7 +174,7 @@
bool HasUserCreatedBookmarks(BookmarkModel* model) {
const BookmarkNode* root_node = model->root_node();
- return base::ranges::any_of(root_node->children(), [](const auto& node) {
+ return std::ranges::any_of(root_node->children(), [](const auto& node) {
return !node->children().empty();
});
}
@@ -359,7 +359,7 @@
}
bool HasLocalOrSyncableBookmarks(const BookmarkModel* model) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
std::array{model->bookmark_bar_node(), model->other_node(),
model->mobile_node()},
[](const BookmarkNode* node) { return !node->children().empty(); });
diff --git a/components/bookmarks/browser/titled_url_index.cc b/components/bookmarks/browser/titled_url_index.cc
index b7c9462..fccfa5b 100644
--- a/components/bookmarks/browser/titled_url_index.cc
+++ b/components/bookmarks/browser/titled_url_index.cc
@@ -15,7 +15,6 @@
#include "base/i18n/case_conversion.h"
#include "base/i18n/unicodestring.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
#include "base/strings/utf_offset_string_conversions.h"
#include "base/trace_event/memory_usage_estimator.h"
@@ -238,7 +237,7 @@
const std::u16string clean_url =
CleanUpUrlForMatching(node->GetTitledUrlNodeUrl(), &adjustments);
std::vector<std::u16string> lower_ancestor_titles;
- base::ranges::transform(
+ std::ranges::transform(
node->GetTitledUrlNodeAncestorTitles(),
std::back_inserter(lower_ancestor_titles),
[](const auto& ancestor_title) {
@@ -250,7 +249,7 @@
// faster, so if it returns false, early exit and avoid the expensive
// `ExtractQueryWords()` calls.
bool approximate_match =
- base::ranges::all_of(query_terms, [&](const auto& word) {
+ std::ranges::all_of(query_terms, [&](const auto& word) {
if (lower_title.find(word) != std::u16string::npos)
return true;
if (clean_url.find(word) != std::u16string::npos)
@@ -342,10 +341,10 @@
// same, since all terms must either title, URL, or path match; but there'll
// be much fewer nodes returned.
std::vector<std::u16string> terms_not_path;
- base::ranges::copy_if(terms, std::back_inserter(terms_not_path),
- [&](const std::u16string& term) {
- return !DoesTermMatchPath(term, matching_algorithm);
- });
+ std::ranges::copy_if(terms, std::back_inserter(terms_not_path),
+ [&](const std::u16string& term) {
+ return !DoesTermMatchPath(term, matching_algorithm);
+ });
if (!terms_not_path.empty())
return RetrieveNodesMatchingAllTerms(terms_not_path, matching_algorithm);
@@ -365,7 +364,7 @@
// Sort `matches_per_term` least frequent first. This prevents terms like
// 'https', which match a lot of nodes, from wasting `max_nodes` capacity.
- base::ranges::sort(
+ std::ranges::sort(
matches_per_term,
[](size_t first, size_t second) { return first < second; },
[](const auto& matches) { return matches.size(); });
diff --git a/components/bookmarks/browser/titled_url_match_unittest.cc b/components/bookmarks/browser/titled_url_match_unittest.cc
index 71f8e48..eba6a09c 100644
--- a/components/bookmarks/browser/titled_url_match_unittest.cc
+++ b/components/bookmarks/browser/titled_url_match_unittest.cc
@@ -4,7 +4,8 @@
#include "components/bookmarks/browser/titled_url_match.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -21,7 +22,7 @@
MatchPositions match_positions = {{1, 3}, {4, 5}, {10, 15}};
std::vector<size_t> expected_offsets = {1, 3, 4, 5, 10, 15};
auto offsets = TitledUrlMatch::OffsetsFromMatchPositions(match_positions);
- EXPECT_TRUE(base::ranges::equal(offsets, expected_offsets));
+ EXPECT_TRUE(std::ranges::equal(offsets, expected_offsets));
}
TEST(TitledUrlMatchTest, ReplaceOffsetsInEmptyMatchPositions) {
@@ -36,7 +37,7 @@
MatchPositions expected_match_positions = {{0, 2}, {3, 4}, {9, 14}};
auto match_positions = TitledUrlMatch::ReplaceOffsetsInMatchPositions(
orig_match_positions, offsets);
- EXPECT_TRUE(base::ranges::equal(match_positions, expected_match_positions));
+ EXPECT_TRUE(std::ranges::equal(match_positions, expected_match_positions));
}
TEST(TitledUrlMatchTest, ReplaceOffsetsRemovesItemsWithNposOffsets) {
@@ -52,7 +53,7 @@
MatchPositions expected_match_positions = {{17, 20}};
auto match_positions = TitledUrlMatch::ReplaceOffsetsInMatchPositions(
orig_match_positions, offsets);
- EXPECT_TRUE(base::ranges::equal(match_positions, expected_match_positions));
+ EXPECT_TRUE(std::ranges::equal(match_positions, expected_match_positions));
}
}
diff --git a/components/bookmarks/browser/typed_count_sorter.cc b/components/bookmarks/browser/typed_count_sorter.cc
index b2f9403c..a38cc00 100644
--- a/components/bookmarks/browser/typed_count_sorter.cc
+++ b/components/bookmarks/browser/typed_count_sorter.cc
@@ -4,9 +4,10 @@
#include "components/bookmarks/browser/typed_count_sorter.h"
+#include <algorithm>
+
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
-#include "base/ranges/algorithm.h"
#include "components/bookmarks/browser/bookmark_client.h"
#include "components/bookmarks/browser/titled_url_node.h"
@@ -69,13 +70,13 @@
client_->GetTypedCountForUrls(&url_typed_count_map);
UrlTypedCountPairs url_typed_counts;
- base::ranges::copy(url_typed_count_map,
- std::back_inserter(url_typed_counts));
+ std::ranges::copy(url_typed_count_map,
+ std::back_inserter(url_typed_counts));
std::sort(url_typed_counts.begin(),
url_typed_counts.end(),
UrlTypedCountPairSortFunctor());
- base::ranges::transform(url_typed_counts, std::back_inserter(*sorted_nodes),
- UrlTypedCountPairNodeLookupFunctor(url_node_map));
+ std::ranges::transform(url_typed_counts, std::back_inserter(*sorted_nodes),
+ UrlTypedCountPairNodeLookupFunctor(url_node_map));
} else {
sorted_nodes->insert(sorted_nodes->end(), matches.begin(), matches.end());
}
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
index 0ee91801..966ad06 100644
--- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
+++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
@@ -4,6 +4,7 @@
#include "components/bookmarks/managed/managed_bookmarks_tracker.h"
+#include <algorithm>
#include <memory>
#include <utility>
@@ -12,7 +13,6 @@
#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/task_environment.h"
@@ -139,7 +139,7 @@
if (node->is_folder()) {
const base::Value::List* children = dict.FindList("children");
return children &&
- base::ranges::equal(
+ std::ranges::equal(
*children, node->children(),
[](const base::Value& child, const auto& child_node) {
return child.is_dict() &&
diff --git a/components/browser_sync/active_devices_provider_impl.cc b/components/browser_sync/active_devices_provider_impl.cc
index 7aa151f..9ec9ef64 100644
--- a/components/browser_sync/active_devices_provider_impl.cc
+++ b/components/browser_sync/active_devices_provider_impl.cc
@@ -4,13 +4,13 @@
#include "components/browser_sync/active_devices_provider_impl.h"
+#include <algorithm>
#include <map>
#include <memory>
#include <utility>
#include <vector>
#include "base/command_line.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "components/browser_sync/browser_sync_switches.h"
@@ -156,8 +156,8 @@
expected_expiration_time <= clock_->Now();
});
- base::ranges::sort(device_infos, [](const syncer::DeviceInfo* left_device,
- const syncer::DeviceInfo* right_device) {
+ std::ranges::sort(device_infos, [](const syncer::DeviceInfo* left_device,
+ const syncer::DeviceInfo* right_device) {
return left_device->last_updated_timestamp() <
right_device->last_updated_timestamp();
});
diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc
index d4acd25..c706303 100644
--- a/components/browser_ui/site_settings/android/website_preference_bridge.cc
+++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc
@@ -4,6 +4,7 @@
#include <jni.h>
+#include <algorithm>
#include <set>
#include <string>
#include <vector>
@@ -23,7 +24,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/user_metrics.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/browser_ui/site_settings/android/storage_info_fetcher.h"
#include "components/browser_ui/site_settings/android/website_preference_bridge_util.h"
#include "components/browsing_data/content/cookie_helper.h"
@@ -619,11 +619,11 @@
std::vector<std::pair<url::Origin, bool>> important_notations(
local_storage_info.size());
- base::ranges::transform(local_storage_info, important_notations.begin(),
- [](const content::StorageUsageInfo& info) {
- return std::make_pair(info.storage_key.origin(),
- false);
- });
+ std::ranges::transform(local_storage_info, important_notations.begin(),
+ [](const content::StorageUsageInfo& info) {
+ return std::make_pair(info.storage_key.origin(),
+ false);
+ });
if (fetch_important) {
permissions::PermissionsClient::Get()->AreSitesImportant(
browser_context, &important_notations);
diff --git a/components/browsing_data/content/android/browsing_data_model_android.cc b/components/browsing_data/content/android/browsing_data_model_android.cc
index 2eda3a8..38eb3b01 100644
--- a/components/browsing_data/content/android/browsing_data_model_android.cc
+++ b/components/browsing_data/content/android/browsing_data_model_android.cc
@@ -47,10 +47,10 @@
content::BrowserContext* browser_context =
content::BrowserContextFromJavaHandle(jbrowser_context_handle);
- base::ranges::transform(origin_to_data_map, important_notations.begin(),
- [](const auto& key_value) {
- return std::make_pair(key_value.first, false);
- });
+ std::ranges::transform(origin_to_data_map, important_notations.begin(),
+ [](const auto& key_value) {
+ return std::make_pair(key_value.first, false);
+ });
if (fetch_important) {
permissions::PermissionsClient::Get()->AreSitesImportant(
browser_context, &important_notations);
diff --git a/components/browsing_data/content/browsing_data_quota_helper_impl.cc b/components/browsing_data/content/browsing_data_quota_helper_impl.cc
index 8478937..5e7c6810 100644
--- a/components/browsing_data/content/browsing_data_quota_helper_impl.cc
+++ b/components/browsing_data/content/browsing_data_quota_helper_impl.cc
@@ -92,7 +92,7 @@
StorageType type,
const std::set<blink::StorageKey>& storage_keys) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- int storage_key_count = base::ranges::count_if(
+ int storage_key_count = std::ranges::count_if(
storage_keys, [](const blink::StorageKey& storage_key) {
return browsing_data::IsWebScheme(storage_key.origin().scheme());
});
diff --git a/components/browsing_data/content/cookie_helper_unittest.cc b/components/browsing_data/content/cookie_helper_unittest.cc
index 3a09420..661384f4 100644
--- a/components/browsing_data/content/cookie_helper_unittest.cc
+++ b/components/browsing_data/content/cookie_helper_unittest.cc
@@ -4,12 +4,12 @@
#include "components/browsing_data/content/cookie_helper.h"
+#include <algorithm>
#include <optional>
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/time/time.h"
@@ -28,10 +28,10 @@
net::CookieAccessResultList ConvertCookieListToCookieAccessResultList(
const net::CookieList& cookie_list) {
net::CookieAccessResultList result;
- base::ranges::transform(cookie_list, std::back_inserter(result),
- [](const net::CanonicalCookie& cookie) {
- return net::CookieWithAccessResult{cookie, {}};
- });
+ std::ranges::transform(cookie_list, std::back_inserter(result),
+ [](const net::CanonicalCookie& cookie) {
+ return net::CookieWithAccessResult{cookie, {}};
+ });
return result;
}
@@ -112,14 +112,14 @@
// For each cookie, look for a matching expectation.
for (const auto& cookie : cookie_list_) {
auto match =
- base::ranges::find_if(cookie_expectations_, CookieMatcher(cookie));
+ std::ranges::find_if(cookie_expectations_, CookieMatcher(cookie));
if (match != cookie_expectations_.end())
match->matched_ = true;
}
// Check that each expectation has been matched.
unsigned long match_count =
- base::ranges::count_if(cookie_expectations_, ExpectationIsMatched);
+ std::ranges::count_if(cookie_expectations_, ExpectationIsMatched);
EXPECT_EQ(cookie_expectations_.size(), match_count);
cookie_expectations_.clear();
diff --git a/components/browsing_data/core/browsing_data_policies_utils.cc b/components/browsing_data/core/browsing_data_policies_utils.cc
index 8f932be..989b81d 100644
--- a/components/browsing_data/core/browsing_data_policies_utils.cc
+++ b/components/browsing_data/core/browsing_data_policies_utils.cc
@@ -4,11 +4,11 @@
#include "components/browsing_data/core/browsing_data_policies_utils.h"
+#include <algorithm>
#include <vector>
#include "base/containers/fixed_flat_map.h"
#include "base/containers/span.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "components/browsing_data/core/browsing_data_utils.h"
#include "components/browsing_data/core/pref_names.h"
diff --git a/components/browsing_data/core/counters/autofill_counter.cc b/components/browsing_data/core/counters/autofill_counter.cc
index f2bc4b9d..8d56397 100644
--- a/components/browsing_data/core/counters/autofill_counter.cc
+++ b/components/browsing_data/core/counters/autofill_counter.cc
@@ -4,12 +4,12 @@
#include "components/browsing_data/core/counters/autofill_counter.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include <vector>
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/browser/data_manager/addresses/address_data_manager.h"
#include "components/autofill/core/browser/data_manager/payments/payments_data_manager.h"
#include "components/autofill/core/browser/data_manager/personal_data_manager.h"
@@ -76,7 +76,7 @@
: period_end_for_testing_;
// Credit cards.
- num_credit_cards_ = base::ranges::count_if(
+ num_credit_cards_ = std::ranges::count_if(
personal_data_manager_->payments_data_manager().GetLocalCreditCards(),
[start, end](const autofill::CreditCard* card) {
return (card->usage_history().modification_date() >= start &&
@@ -84,7 +84,7 @@
});
// Addresses.
- num_addresses_ = base::ranges::count_if(
+ num_addresses_ = std::ranges::count_if(
personal_data_manager_->address_data_manager().GetProfilesByRecordType(
autofill::AutofillProfile::RecordType::kLocalOrSyncable),
[start, end](const autofill::AutofillProfile* address) {
diff --git a/components/browsing_topics/annotator_impl.cc b/components/browsing_topics/annotator_impl.cc
index ada54c1f..cd52996 100644
--- a/components/browsing_topics/annotator_impl.cc
+++ b/components/browsing_topics/annotator_impl.cc
@@ -9,13 +9,13 @@
#include "components/browsing_topics/annotator_impl.h"
+#include <algorithm>
#include <vector>
#include "base/barrier_closure.h"
#include "base/containers/contains.h"
#include "base/dcheck_is_on.h"
#include "base/files/file_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/sequenced_task_runner.h"
@@ -110,7 +110,7 @@
int MeaninglessPrefixLength(const std::string& host) {
size_t len = host.size();
- int dots = base::ranges::count(host, '.');
+ int dots = std::ranges::count(host, '.');
if (dots < 2) {
return 0;
}
diff --git a/components/browsing_topics/browsing_topics_calculator.cc b/components/browsing_topics/browsing_topics_calculator.cc
index 80efb98..a581644 100644
--- a/components/browsing_topics/browsing_topics_calculator.cc
+++ b/components/browsing_topics/browsing_topics_calculator.cc
@@ -4,10 +4,11 @@
#include "components/browsing_topics/browsing_topics_calculator.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
#include "base/metrics/histogram_functions.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "components/browsing_topics/annotator.h"
#include "components/browsing_topics/common/semantic_tree.h"
@@ -306,8 +307,8 @@
left.second.second > right.second.second);
});
- base::ranges::transform(top_topics_count, std::back_inserter(top_topics),
- &TopicsCountValue::first);
+ std::ranges::transform(top_topics_count, std::back_inserter(top_topics),
+ &TopicsCountValue::first);
padded_top_topics_start_index = top_topics.size();
diff --git a/components/browsing_topics/browsing_topics_service_impl.cc b/components/browsing_topics/browsing_topics_service_impl.cc
index 75e86d8..1d997af 100644
--- a/components/browsing_topics/browsing_topics_service_impl.cc
+++ b/components/browsing_topics/browsing_topics_service_impl.cc
@@ -4,6 +4,7 @@
#include "components/browsing_topics/browsing_topics_service_impl.h"
+#include <algorithm>
#include <random>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/time/time.h"
#include "components/browsing_topics/browsing_topics_calculator.h"
@@ -1031,7 +1031,7 @@
}
// Reorder the epochs from latest to oldest.
- base::ranges::reverse(webui_state->epochs);
+ std::ranges::reverse(webui_state->epochs);
std::move(callback).Run(
mojom::WebUIGetBrowsingTopicsStateResult::NewBrowsingTopicsState(
diff --git a/components/browsing_topics/browsing_topics_state_unittest.cc b/components/browsing_topics/browsing_topics_state_unittest.cc
index a2c2e7bd..20107b7 100644
--- a/components/browsing_topics/browsing_topics_state_unittest.cc
+++ b/components/browsing_topics/browsing_topics_state_unittest.cc
@@ -4,12 +4,13 @@
#include "components/browsing_topics/browsing_topics_state.h"
+#include <algorithm>
+
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/functional/callback_helpers.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/values_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
@@ -156,7 +157,7 @@
EXPECT_TRUE(state.epochs().empty());
EXPECT_TRUE(state.next_scheduled_calculation_time().is_null());
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey));
EXPECT_TRUE(state.HasScheduledSaveForTesting());
EXPECT_TRUE(observed_state_loaded());
@@ -189,7 +190,7 @@
EXPECT_TRUE(state.epochs().empty());
EXPECT_EQ(state.next_scheduled_calculation_time(),
base::Time::Now() + kNextScheduledCalculationDelay);
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey));
EXPECT_TRUE(state.HasScheduledSaveForTesting());
@@ -280,7 +281,7 @@
// The `next_scheduled_calculation_time` and `hmac_key` are unaffected.
EXPECT_EQ(state.next_scheduled_calculation_time(), base::Time());
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey));
}
TEST_F(BrowsingTopicsStateTest, EpochsForSite_Empty) {
@@ -596,7 +597,7 @@
EXPECT_EQ(state.epochs().size(), 0u);
EXPECT_TRUE(state.next_scheduled_calculation_time().is_null());
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kZeroKey));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kZeroKey));
histograms.ExpectUniqueSample(
"BrowsingTopics.BrowsingTopicsState.LoadFinishStatus", false,
@@ -621,7 +622,7 @@
EXPECT_FALSE(state.epochs()[0].empty());
EXPECT_EQ(state.epochs()[0].model_version(), kModelVersion);
EXPECT_EQ(state.next_scheduled_calculation_time(), kTime2);
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey2));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey2));
histograms.ExpectUniqueSample(
"BrowsingTopics.BrowsingTopicsState.LoadFinishStatus", true,
@@ -654,7 +655,7 @@
EXPECT_FALSE(state.epochs()[0].empty());
EXPECT_EQ(state.epochs()[0].model_version(), kModelVersion);
EXPECT_EQ(state.next_scheduled_calculation_time(), kTime2);
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey2));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey2));
histograms.ExpectUniqueSample(
"BrowsingTopics.BrowsingTopicsState.LoadFinishStatus", true,
@@ -687,7 +688,7 @@
EXPECT_FALSE(state.epochs()[0].empty());
EXPECT_EQ(state.epochs()[0].model_version(), kModelVersion);
EXPECT_EQ(state.next_scheduled_calculation_time(), kTime2);
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey2));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey2));
histograms.ExpectUniqueSample(
"BrowsingTopics.BrowsingTopicsState.LoadFinishStatus", true,
@@ -712,7 +713,7 @@
EXPECT_TRUE(state.epochs().empty());
EXPECT_TRUE(state.next_scheduled_calculation_time().is_null());
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey2));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey2));
histograms.ExpectUniqueSample(
"BrowsingTopics.BrowsingTopicsState.LoadFinishStatus", true,
@@ -748,7 +749,7 @@
EXPECT_EQ(state.next_scheduled_calculation_time(),
base::Time::Now() + kNextScheduledCalculationDelay);
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey));
}
TEST_F(BrowsingTopicsStateTest, ClearAllTopics) {
@@ -777,7 +778,7 @@
EXPECT_EQ(state.next_scheduled_calculation_time(),
base::Time::Now() + kNextScheduledCalculationDelay);
- EXPECT_TRUE(base::ranges::equal(state.hmac_key(), kTestKey));
+ EXPECT_TRUE(std::ranges::equal(state.hmac_key(), kTestKey));
}
TEST_F(BrowsingTopicsStateTest, ClearTopic) {
diff --git a/components/browsing_topics/common/semantic_tree.cc b/components/browsing_topics/common/semantic_tree.cc
index 8a4ee04..fe188cf 100644
--- a/components/browsing_topics/common/semantic_tree.cc
+++ b/components/browsing_topics/common/semantic_tree.cc
@@ -870,7 +870,7 @@
static const base::NoDestructor<RepresentativenessMap>
kRepresentativenessMapV2([]() -> RepresentativenessMap {
RepresentativenessMap map;
- base::ranges::copy_if(
+ std::ranges::copy_if(
GetInternalRepresentativenessMap(),
std::inserter(map, map.end()), [](const auto& topic_kv) {
return topic_kv.first != 275 && topic_kv.first != 279;
diff --git a/components/browsing_topics/util.cc b/components/browsing_topics/util.cc
index be2ea25..03097a6c 100644
--- a/components/browsing_topics/util.cc
+++ b/components/browsing_topics/util.cc
@@ -4,9 +4,10 @@
#include "components/browsing_topics/util.h"
+#include <algorithm>
+
#include "base/numerics/byte_conversions.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "crypto/hmac.h"
#include "crypto/sha2.h"
#include "third_party/blink/public/common/features.h"
@@ -129,7 +130,7 @@
void OverrideHmacKeyForTesting(ReadOnlyHmacKey hmac_key) {
g_hmac_key_overridden = true;
- base::ranges::copy(hmac_key, GetHmacKeyOverrideForTesting().begin());
+ std::ranges::copy(hmac_key, GetHmacKeyOverrideForTesting().begin());
}
} // namespace browsing_topics
diff --git a/components/cast_receiver/browser/runtime_application_base.cc b/components/cast_receiver/browser/runtime_application_base.cc
index b9be609d..c417de0 100644
--- a/components/cast_receiver/browser/runtime_application_base.cc
+++ b/components/cast_receiver/browser/runtime_application_base.cc
@@ -4,8 +4,9 @@
#include "components/cast_receiver/browser/runtime_application_base.h"
+#include <algorithm>
+
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "components/cast_receiver/browser/permissions_manager_impl.h"
#include "components/media_control/browser/media_blocker.h"
diff --git a/components/cast_receiver/browser/streaming_receiver_session_client.cc b/components/cast_receiver/browser/streaming_receiver_session_client.cc
index 2502c46..f84c3ea1 100644
--- a/components/cast_receiver/browser/streaming_receiver_session_client.cc
+++ b/components/cast_receiver/browser/streaming_receiver_session_client.cc
@@ -4,11 +4,11 @@
#include "components/cast_receiver/browser/streaming_receiver_session_client.h"
+#include <algorithm>
#include <utility>
#include "base/containers/contains.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/task/sequenced_task_runner.h"
#include "components/cast/message_port/platform_message_port.h"
diff --git a/components/cast_streaming/browser/receiver_config_conversions.cc b/components/cast_streaming/browser/receiver_config_conversions.cc
index a3271336..11291d6 100644
--- a/components/cast_streaming/browser/receiver_config_conversions.cc
+++ b/components/cast_streaming/browser/receiver_config_conversions.cc
@@ -4,7 +4,8 @@
#include "components/cast_streaming/browser/receiver_config_conversions.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/time/time.h"
#include "components/cast_streaming/browser/public/receiver_config.h"
#include "media/base/audio_codecs.h"
@@ -156,28 +157,28 @@
const ReceiverConfig& config) {
std::vector<openscreen::cast::AudioCodec> audio_codecs;
audio_codecs.reserve(config.audio_codecs.size());
- base::ranges::transform(
- config.audio_codecs.begin(), config.audio_codecs.end(),
- std::back_inserter(audio_codecs), media::cast::ToAudioCaptureConfigCodec);
+ std::ranges::transform(config.audio_codecs.begin(), config.audio_codecs.end(),
+ std::back_inserter(audio_codecs),
+ media::cast::ToAudioCaptureConfigCodec);
std::vector<openscreen::cast::VideoCodec> video_codecs;
video_codecs.reserve(config.video_codecs.size());
- base::ranges::transform(
- config.video_codecs.begin(), config.video_codecs.end(),
- std::back_inserter(video_codecs), media::cast::ToVideoCaptureConfigCodec);
+ std::ranges::transform(config.video_codecs.begin(), config.video_codecs.end(),
+ std::back_inserter(video_codecs),
+ media::cast::ToVideoCaptureConfigCodec);
openscreen::cast::ReceiverConstraints constraints(std::move(video_codecs),
std::move(audio_codecs));
constraints.audio_limits.reserve(config.audio_limits.size());
- base::ranges::transform(config.audio_limits,
- std::back_inserter(constraints.audio_limits),
- ToOpenscreenAudioLimitsType);
+ std::ranges::transform(config.audio_limits,
+ std::back_inserter(constraints.audio_limits),
+ ToOpenscreenAudioLimitsType);
constraints.video_limits.reserve(config.video_limits.size());
- base::ranges::transform(config.video_limits,
- std::back_inserter(constraints.video_limits),
- ToOpenscreenVideoLimitsType);
+ std::ranges::transform(config.video_limits,
+ std::back_inserter(constraints.video_limits),
+ ToOpenscreenVideoLimitsType);
if (config.display_description) {
constraints.display_description =
diff --git a/components/client_update_protocol/ecdsa.cc b/components/client_update_protocol/ecdsa.cc
index efc1c74..00c2a8a 100644
--- a/components/client_update_protocol/ecdsa.cc
+++ b/components/client_update_protocol/ecdsa.cc
@@ -4,6 +4,7 @@
#include "components/client_update_protocol/ecdsa.h"
+#include <algorithm>
#include <cstdint>
#include <string>
#include <string_view>
@@ -13,7 +14,6 @@
#include "base/check.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -167,7 +167,7 @@
// request hash. (This is a quick rejection test; the signature test is
// authoritative, but slower.)
DCHECK_EQ(request_hash_.size(), crypto::kSHA256Length);
- if (!base::ranges::equal(observed_request_hash, request_hash_)) {
+ if (!std::ranges::equal(observed_request_hash, request_hash_)) {
return false;
}
diff --git a/components/commerce/core/product_specifications/product_specifications_service.cc b/components/commerce/core/product_specifications/product_specifications_service.cc
index c750caf5..6aa1309 100644
--- a/components/commerce/core/product_specifications/product_specifications_service.cc
+++ b/components/commerce/core/product_specifications/product_specifications_service.cc
@@ -4,6 +4,7 @@
#include "components/commerce/core/product_specifications/product_specifications_service.h"
+#include <algorithm>
#include <memory>
#include <optional>
@@ -13,7 +14,6 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/hash/sha1.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/uuid.h"
@@ -30,7 +30,7 @@
std::string suffix_str = base::Base64Encode(base::SHA1HashString(uuid));
syncer::UniquePosition::Suffix suffix;
CHECK_EQ(suffix.size(), suffix_str.size());
- base::ranges::copy(suffix_str, suffix.begin());
+ std::ranges::copy(suffix_str, suffix.begin());
return suffix;
}
@@ -99,7 +99,7 @@
void SortItemSpecifics(
std::vector<sync_pb::ProductComparisonSpecifics>& item_specifics) {
- base::ranges::sort(
+ std::ranges::sort(
item_specifics, [](const auto& specifics_a, const auto& specifics_b) {
return syncer::UniquePosition::FromProto(
specifics_a.product_comparison_item().unique_position())
diff --git a/components/commerce/core/product_specifications/product_specifications_service_unittest.cc b/components/commerce/core/product_specifications/product_specifications_service_unittest.cc
index 3526224..c465a66 100644
--- a/components/commerce/core/product_specifications/product_specifications_service_unittest.cc
+++ b/components/commerce/core/product_specifications/product_specifications_service_unittest.cc
@@ -917,7 +917,7 @@
std::vector<ProductSpecificationsSet> multi_specifics_sets =
service()->GetAllProductSpecifications();
- const auto iter = base::ranges::find_if(
+ const auto iter = std::ranges::find_if(
multi_specifics_sets, [&multi_specs_set_uuid](const auto& query_set) {
return query_set.uuid().AsLowercaseString() == multi_specs_set_uuid;
});
@@ -942,7 +942,7 @@
for (const auto& expected_title :
{u"product one title", u"product two title"}) {
const auto& url_infos = set_with_titles->url_infos();
- const auto iter = base::ranges::find_if(
+ const auto iter = std::ranges::find_if(
url_infos, [&expected_title](const UrlInfo& query_url_info) {
return query_url_info.title == expected_title;
});
diff --git a/components/component_updater/component_installer.cc b/components/component_updater/component_installer.cc
index 000fbec..0803460 100644
--- a/components/component_updater/component_installer.cc
+++ b/components/component_updater/component_installer.cc
@@ -4,6 +4,7 @@
#include "components/component_updater/component_installer.h"
+#include <algorithm>
#include <cstdint>
#include <optional>
#include <string>
@@ -20,7 +21,6 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/sequence_checker.h"
#include "base/strings/string_util.h"
#include "base/task/sequenced_task_runner.h"
@@ -344,7 +344,7 @@
const base::Value::List* accept_archs = manifest->FindList("accept_arch");
if (accept_archs != nullptr &&
- base::ranges::none_of(*accept_archs, [](const base::Value& v) {
+ std::ranges::none_of(*accept_archs, [](const base::Value& v) {
static const char* current_arch =
update_client::UpdateQueryParams::GetArch();
return v.is_string() && v.GetString() == current_arch;
diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
index b2a4be091..fdacbf1 100644
--- a/components/component_updater/component_updater_service.cc
+++ b/components/component_updater/component_updater_service.cc
@@ -4,6 +4,7 @@
#include "components/component_updater/component_updater_service.h"
+#include <algorithm>
#include <map>
#include <memory>
#include <optional>
@@ -20,7 +21,6 @@
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/sequence_checker.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
@@ -245,7 +245,7 @@
const bool result = components_.find(id)->second.installer->Uninstall();
- const auto pos = base::ranges::find(components_order_, id);
+ const auto pos = std::ranges::find(components_order_, id);
if (pos != components_order_.end()) {
components_order_.erase(pos);
}
diff --git a/components/component_updater/installer_policies/autofill_states_component_installer.cc b/components/component_updater/installer_policies/autofill_states_component_installer.cc
index b7a8e1f1..0b52d471 100644
--- a/components/component_updater/installer_policies/autofill_states_component_installer.cc
+++ b/components/component_updater/installer_policies/autofill_states_component_installer.cc
@@ -4,11 +4,12 @@
#include "components/component_updater/installer_policies/autofill_states_component_installer.h"
+#include <algorithm>
+
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/functional/callback.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/values.h"
#include "components/autofill/core/browser/geo/country_data.h"
#include "components/autofill/core/common/autofill_prefs.h"
@@ -86,7 +87,7 @@
const base::Value::Dict& manifest,
const base::FilePath& install_dir) const {
// Verify that state files are present.
- return base::ranges::count(
+ return std::ranges::count(
AutofillStateFileNames(), true, [&](const auto& filename) {
return base::PathExists(install_dir.Append(filename));
}) > 0;
diff --git a/components/component_updater/installer_policies/on_device_head_suggest_component_installer.cc b/components/component_updater/installer_policies/on_device_head_suggest_component_installer.cc
index 31ec07c..9dcc08b 100644
--- a/components/component_updater/installer_policies/on_device_head_suggest_component_installer.cc
+++ b/components/component_updater/installer_policies/on_device_head_suggest_component_installer.cc
@@ -4,6 +4,7 @@
#include "components/component_updater/installer_policies/on_device_head_suggest_component_installer.h"
+#include <algorithm>
#include <cstdint>
#include <memory>
#include <string>
@@ -13,7 +14,6 @@
#include "base/functional/callback.h"
#include "base/metrics/field_trial_params.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "components/component_updater/component_installer.h"
@@ -51,8 +51,8 @@
locale.erase(std::remove(locale.begin(), locale.end(), c), locale.end());
}
- base::ranges::transform(locale, locale.begin(),
- [](char c) { return base::ToUpperASCII(c); });
+ std::ranges::transform(locale, locale.begin(),
+ [](char c) { return base::ToUpperASCII(c); });
if (!locale_constraint.empty()) {
locale += locale_constraint;
diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc
index 795ef891..87519a1 100644
--- a/components/content_settings/core/browser/content_settings_uma_util.cc
+++ b/components/content_settings/core/browser/content_settings_uma_util.cc
@@ -4,10 +4,11 @@
#include "components/content_settings/core/browser/content_settings_uma_util.h"
+#include <functional>
+
#include "base/containers/fixed_flat_map.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
-#include "base/ranges/functional.h"
#include "base/strings/strcat.h"
#include "components/content_settings/core/common/content_settings.h"
@@ -159,9 +160,9 @@
// LINT.ThenChange(//tools/metrics/histograms/enums.xml:ContentType)
constexpr int kkHistogramValueMax =
- base::ranges::max_element(kHistogramValue,
- base::ranges::less{},
- &decltype(kHistogramValue)::value_type::second)
+ std::ranges::max_element(kHistogramValue,
+ std::ranges::less{},
+ &decltype(kHistogramValue)::value_type::second)
->second;
std::string GetProviderNameForHistograms(
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 196889f..f946d32c 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -21,7 +21,6 @@
#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
@@ -731,13 +730,12 @@
int max_requester =
empty
? 0
- : base::ranges::max_element(num_requester, {}, get_value)->second;
+ : std::ranges::max_element(num_requester, {}, get_value)->second;
base::UmaHistogramCounts1000(histogram_name + ".MaxRequester",
max_requester);
int max_toplevel =
- empty
- ? 0
- : base::ranges::max_element(num_toplevel, {}, get_value)->second;
+ empty ? 0
+ : std::ranges::max_element(num_toplevel, {}, get_value)->second;
base::UmaHistogramCounts1000(histogram_name + ".MaxTopLevel",
max_toplevel);
}
diff --git a/components/content_settings/core/common/host_indexed_content_settings.cc b/components/content_settings/core/common/host_indexed_content_settings.cc
index c4202a52..aaf536a1 100644
--- a/components/content_settings/core/common/host_indexed_content_settings.cc
+++ b/components/content_settings/core/common/host_indexed_content_settings.cc
@@ -66,7 +66,7 @@
const Rules& settings,
const base::Clock* clock,
bool return_expired_settings_) {
- const auto it = base::ranges::find_if(settings, [&](const auto& entry) {
+ const auto it = std::ranges::find_if(settings, [&](const auto& entry) {
return entry.first.primary_pattern.Matches(primary_url) &&
entry.first.secondary_pattern.Matches(secondary_url) &&
(return_expired_settings_ ||
diff --git a/components/continuous_search/common/title_validator.cc b/components/continuous_search/common/title_validator.cc
index 7507a6f..44e3d74e 100644
--- a/components/continuous_search/common/title_validator.cc
+++ b/components/continuous_search/common/title_validator.cc
@@ -4,11 +4,11 @@
#include "components/continuous_search/common/title_validator.h"
+#include <algorithm>
#include <string_view>
#include "base/containers/adapters.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
namespace continuous_search {
@@ -30,9 +30,9 @@
template <typename T, typename CharT = typename T::value_type>
std::basic_string<CharT> ValidateTitleT(T input) {
auto begin_it =
- base::ranges::find_if_not(input, &IsUnicodeWhitespaceOrControl);
- auto end_it = base::ranges::find_if_not(base::Reversed(input),
- &IsUnicodeWhitespaceOrControl);
+ std::ranges::find_if_not(input, &IsUnicodeWhitespaceOrControl);
+ auto end_it = std::ranges::find_if_not(base::Reversed(input),
+ &IsUnicodeWhitespaceOrControl);
std::basic_string<CharT> output;
if (input.empty() || begin_it == input.end()) {
diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
index a32a157..05e61591 100644
--- a/components/crash/core/app/breakpad_linux.cc
+++ b/components/crash/core/app/breakpad_linux.cc
@@ -42,7 +42,6 @@
#include "base/path_service.h"
#include "base/posix/eintr_wrapper.h"
#include "base/posix/global_descriptors.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -857,8 +856,8 @@
WriteLog(msg, sizeof(msg) - 1);
return false;
}
- return base::ranges::all_of(base::span(buf, bytes_read),
- base::IsHexDigit<char>);
+ return std::ranges::all_of(base::span(buf, bytes_read),
+ base::IsHexDigit<char>);
}
// |buf| should be |expected_len| + 1 characters in size and nullptr terminated.
diff --git a/components/custom_handlers/protocol_handler_registry.cc b/components/custom_handlers/protocol_handler_registry.cc
index d339891e..ac7f51739 100644
--- a/components/custom_handlers/protocol_handler_registry.cc
+++ b/components/custom_handlers/protocol_handler_registry.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <string_view>
#include <utility>
@@ -16,7 +17,6 @@
#include "base/memory/ref_counted.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/custom_handlers/pref_names.h"
#include "components/custom_handlers/protocol_handler.h"
@@ -504,7 +504,7 @@
DCHECK(IsRegistered(handler));
auto p = protocol_handlers_.find(handler.protocol());
ProtocolHandlerList& list = p->second;
- list.erase(base::ranges::find(list, handler));
+ list.erase(std::ranges::find(list, handler));
list.insert(list.begin(), handler);
}
@@ -697,7 +697,7 @@
void ProtocolHandlerRegistry::EraseHandler(const ProtocolHandler& handler,
ProtocolHandlerList* list) {
- list->erase(base::ranges::find(*list, handler));
+ list->erase(std::ranges::find(*list, handler));
}
void ProtocolHandlerRegistry::OnSetAsDefaultProtocolClientFinished(
diff --git a/components/data_sharing/internal/collaboration_group_sync_bridge_unittest.cc b/components/data_sharing/internal/collaboration_group_sync_bridge_unittest.cc
index 34c8c18..3dc5ba6 100644
--- a/components/data_sharing/internal/collaboration_group_sync_bridge_unittest.cc
+++ b/components/data_sharing/internal/collaboration_group_sync_bridge_unittest.cc
@@ -4,10 +4,10 @@
#include "components/data_sharing/internal/collaboration_group_sync_bridge.h"
+#include <algorithm>
#include <memory>
#include <set>
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/mock_callback.h"
diff --git a/components/data_sharing/internal/group_data_model.cc b/components/data_sharing/internal/group_data_model.cc
index 5877fc63..9b23718 100644
--- a/components/data_sharing/internal/group_data_model.cc
+++ b/components/data_sharing/internal/group_data_model.cc
@@ -188,9 +188,9 @@
// Handle deletions synchronously, since they don't need SDK call.
std::vector<GroupId> deleted_group_ids;
- base::ranges::set_difference(store_groups.begin(), store_groups.end(),
- bridge_groups.begin(), bridge_groups.end(),
- std::back_inserter(deleted_group_ids));
+ std::ranges::set_difference(store_groups.begin(), store_groups.end(),
+ bridge_groups.begin(), bridge_groups.end(),
+ std::back_inserter(deleted_group_ids));
std::unordered_map<GroupId, std::optional<GroupData>> deleted_groups;
for (const auto& group_id : deleted_group_ids) {
@@ -358,13 +358,13 @@
}
std::vector<GaiaId> added_members_gaia_ids;
- base::ranges::set_difference(
+ std::ranges::set_difference(
new_members_gaia_ids.begin(), new_members_gaia_ids.end(),
old_members_gaia_ids.begin(), old_members_gaia_ids.end(),
std::back_inserter(added_members_gaia_ids));
std::vector<GaiaId> removed_members_gaia_ids;
- base::ranges::set_difference(
+ std::ranges::set_difference(
old_members_gaia_ids.begin(), old_members_gaia_ids.end(),
new_members_gaia_ids.begin(), new_members_gaia_ids.end(),
std::back_inserter(removed_members_gaia_ids));
diff --git a/components/desks_storage/core/desk_model_wrapper_unittests.cc b/components/desks_storage/core/desk_model_wrapper_unittests.cc
index 69fa05c..bc6f150 100644
--- a/components/desks_storage/core/desk_model_wrapper_unittests.cc
+++ b/components/desks_storage/core/desk_model_wrapper_unittests.cc
@@ -417,11 +417,11 @@
EXPECT_TRUE(
FindUuidInUuidList(MakeTestUuidString(TestUuidId(5)), result.entries));
// One of these templates should be from policy.
- EXPECT_EQ(base::ranges::count_if(result.entries,
- [](const ash::DeskTemplate* entry) {
- return entry->source() ==
- ash::DeskTemplateSource::kPolicy;
- }),
+ EXPECT_EQ(std::ranges::count_if(result.entries,
+ [](const ash::DeskTemplate* entry) {
+ return entry->source() ==
+ ash::DeskTemplateSource::kPolicy;
+ }),
1l);
model_wrapper_->SetPolicyDeskTemplates("");
diff --git a/components/desks_storage/core/desk_sync_bridge_unittest.cc b/components/desks_storage/core/desk_sync_bridge_unittest.cc
index 30700c4..2002c68e 100644
--- a/components/desks_storage/core/desk_sync_bridge_unittest.cc
+++ b/components/desks_storage/core/desk_sync_bridge_unittest.cc
@@ -1160,11 +1160,11 @@
EXPECT_EQ(result.entries.size(), 4ul);
// Two of these templates should be from policy.
- EXPECT_EQ(base::ranges::count_if(result.entries,
- [](const ash::DeskTemplate* entry) {
- return entry->source() ==
- ash::DeskTemplateSource::kPolicy;
- }),
+ EXPECT_EQ(std::ranges::count_if(result.entries,
+ [](const ash::DeskTemplate* entry) {
+ return entry->source() ==
+ ash::DeskTemplateSource::kPolicy;
+ }),
2l);
bridge()->SetPolicyDeskTemplates("");
diff --git a/components/desks_storage/core/desk_template_util.cc b/components/desks_storage/core/desk_template_util.cc
index eae305f19..1dbedd4 100644
--- a/components/desks_storage/core/desk_template_util.cc
+++ b/components/desks_storage/core/desk_template_util.cc
@@ -4,7 +4,7 @@
#include "components/desks_storage/core/desk_template_util.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
namespace desks_storage {
@@ -15,7 +15,7 @@
const base::Uuid& uuid,
const base::flat_map<base::Uuid, std::unique_ptr<ash::DeskTemplate>>&
entries) {
- auto iter = base::ranges::find_if(
+ auto iter = std::ranges::find_if(
entries,
[name, uuid](const std::pair<base::Uuid,
std::unique_ptr<ash::DeskTemplate>>& entry) {
diff --git a/components/desks_storage/core/local_desk_data_manager_unittests.cc b/components/desks_storage/core/local_desk_data_manager_unittests.cc
index 4bb2dff96..c502801 100644
--- a/components/desks_storage/core/local_desk_data_manager_unittests.cc
+++ b/components/desks_storage/core/local_desk_data_manager_unittests.cc
@@ -507,11 +507,11 @@
EXPECT_TRUE(FindUuidInUuidList(GetTestUuid(TestUuidId(9)), result.entries));
// One of these templates should be from policy.
- EXPECT_EQ(base::ranges::count_if(result.entries,
- [](const ash::DeskTemplate* entry) {
- return entry->source() ==
- ash::DeskTemplateSource::kPolicy;
- }),
+ EXPECT_EQ(std::ranges::count_if(result.entries,
+ [](const ash::DeskTemplate* entry) {
+ return entry->source() ==
+ ash::DeskTemplateSource::kPolicy;
+ }),
1l);
// Sanity check for the search function.
diff --git a/components/device_event_log/device_event_log_impl.cc b/components/device_event_log/device_event_log_impl.cc
index 4128396..b2915c2 100644
--- a/components/device_event_log/device_event_log_impl.cc
+++ b/components/device_event_log/device_event_log_impl.cc
@@ -9,6 +9,7 @@
#include "components/device_event_log/device_event_log_impl.h"
+#include <algorithm>
#include <array>
#include <cmath>
#include <list>
@@ -23,7 +24,6 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/process/process_handle.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -455,9 +455,8 @@
}
void DeviceEventLogImpl::Clear(const base::Time& begin, const base::Time& end) {
- entries_.erase(
- base::ranges::lower_bound(entries_, begin, {}, &LogEntry::time),
- base::ranges::upper_bound(entries_, end, {}, &LogEntry::time));
+ entries_.erase(std::ranges::lower_bound(entries_, begin, {}, &LogEntry::time),
+ std::ranges::upper_bound(entries_, end, {}, &LogEntry::time));
}
int DeviceEventLogImpl::GetCountByLevelForTesting(LogLevel level) {
diff --git a/components/device_event_log/device_event_log_impl_unittest.cc b/components/device_event_log/device_event_log_impl_unittest.cc
index 7c7471aa..dca9964 100644
--- a/components/device_event_log/device_event_log_impl_unittest.cc
+++ b/components/device_event_log/device_event_log_impl_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <string>
@@ -13,7 +14,6 @@
#include "base/format_macros.h"
#include "base/functional/bind.h"
#include "base/i18n/time_formatting.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "base/test/test_simple_task_runner.h"
@@ -74,7 +74,7 @@
}
size_t CountLines(const std::string& input) {
- return base::ranges::count(input, '\n');
+ return std::ranges::count(input, '\n');
}
std::string GetAsString(StringOrder order,
diff --git a/components/discardable_memory/common/discardable_shared_memory_heap.cc b/components/discardable_memory/common/discardable_shared_memory_heap.cc
index 92df90b..244890c 100644
--- a/components/discardable_memory/common/discardable_shared_memory_heap.cc
+++ b/components/discardable_memory/common/discardable_shared_memory_heap.cc
@@ -4,6 +4,7 @@
#include "components/discardable_memory/common/discardable_shared_memory_heap.h"
+#include <algorithm>
#include <bit>
#include <memory>
#include <string>
@@ -16,7 +17,6 @@
#include "base/memory/page_size.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/trace_event/memory_dump_manager.h"
@@ -328,7 +328,7 @@
// This iterates over all the memory allocated by the heap, and calls
// |OnMemoryDump| for each. It does not contain any information about the
// DiscardableSharedMemoryHeap itself.
- base::ranges::for_each(
+ std::ranges::for_each(
memory_segments_,
[pmd](const std::unique_ptr<ScopedMemorySegment>& segment) {
segment->OnMemoryDump(pmd);
@@ -500,7 +500,7 @@
return dump;
}
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
memory_segments_,
[span](const std::unique_ptr<ScopedMemorySegment>& segment) {
return segment->ContainsSpan(span);
diff --git a/components/dom_distiller/core/distiller.cc b/components/dom_distiller/core/distiller.cc
index 67efc14..ea672c9 100644
--- a/components/dom_distiller/core/distiller.cc
+++ b/components/dom_distiller/core/distiller.cc
@@ -4,6 +4,7 @@
#include "components/dom_distiller/core/distiller.h"
+#include <algorithm>
#include <map>
#include <memory>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
@@ -283,8 +283,8 @@
DCHECK(page_data->distilled_page_proto);
DCHECK(url_fetcher);
auto fetcher_it =
- base::ranges::find(page_data->image_fetchers_, url_fetcher,
- &std::unique_ptr<DistillerURLFetcher>::get);
+ std::ranges::find(page_data->image_fetchers_, url_fetcher,
+ &std::unique_ptr<DistillerURLFetcher>::get);
DCHECK(fetcher_it != page_data->image_fetchers_.end());
// Delete the |url_fetcher| by DeleteSoon since the OnFetchImageDone
diff --git a/components/dom_distiller/core/dom_distiller_service.cc b/components/dom_distiller/core/dom_distiller_service.cc
index bbb308fa..ade780b 100644
--- a/components/dom_distiller/core/dom_distiller_service.cc
+++ b/components/dom_distiller/core/dom_distiller_service.cc
@@ -4,12 +4,12 @@
#include "components/dom_distiller/core/dom_distiller_service.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include "base/functional/bind.h"
#include "base/location.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/uuid.h"
#include "components/dom_distiller/core/distilled_content_store.h"
@@ -114,8 +114,7 @@
}
void DomDistillerService::CancelTask(TaskTracker* task) {
- auto it =
- base::ranges::find(tasks_, task, &std::unique_ptr<TaskTracker>::get);
+ auto it = std::ranges::find(tasks_, task, &std::unique_ptr<TaskTracker>::get);
if (it != tasks_.end()) {
it->release();
tasks_.erase(it);
diff --git a/components/download/internal/background_service/client_set_unittest.cc b/components/download/internal/background_service/client_set_unittest.cc
index a37674e..e37ad71 100644
--- a/components/download/internal/background_service/client_set_unittest.cc
+++ b/components/download/internal/background_service/client_set_unittest.cc
@@ -4,7 +4,8 @@
#include "components/download/internal/background_service/client_set.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/download/public/background_service/clients.h"
#include "components/download/public/background_service/test/empty_client.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -34,7 +35,7 @@
DownloadClient::DEBUGGING};
std::set<DownloadClient> actual_set = clients.GetRegisteredClients();
- EXPECT_TRUE(base::ranges::equal(expected_set, actual_set));
+ EXPECT_TRUE(std::ranges::equal(expected_set, actual_set));
}
} // namespace download
diff --git a/components/download/internal/background_service/entry_utils_unittest.cc b/components/download/internal/background_service/entry_utils_unittest.cc
index 2267dad..ce61a57 100644
--- a/components/download/internal/background_service/entry_utils_unittest.cc
+++ b/components/download/internal/background_service/entry_utils_unittest.cc
@@ -4,7 +4,8 @@
#include "components/download/internal/background_service/entry_utils.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/download/internal/background_service/test/entry_utils.h"
#include "components/download/internal/background_service/test/test_download_driver.h"
#include "components/download/public/background_service/clients.h"
@@ -62,7 +63,7 @@
EXPECT_EQ(mapped1.end(), mapped1.find(DownloadClient::TEST));
auto list1 = mapped1.find(DownloadClient::INVALID)->second;
- EXPECT_TRUE(base::ranges::equal(expected_list, list1));
+ EXPECT_TRUE(std::ranges::equal(expected_list, list1));
// If DownloadClient::TEST is a valid Client, it should have the associated
// entries.
@@ -74,7 +75,7 @@
EXPECT_EQ(mapped2.end(), mapped2.find(DownloadClient::INVALID));
auto list2 = mapped2.find(DownloadClient::TEST)->second;
- EXPECT_TRUE(base::ranges::equal(expected_list, list2));
+ EXPECT_TRUE(std::ranges::equal(expected_list, list2));
}
TEST(DownloadServiceEntryUtilsTest, GetSchedulingCriteria) {
diff --git a/components/download/internal/background_service/test/entry_utils.cc b/components/download/internal/background_service/test/entry_utils.cc
index 5159ed9f..15a88ca1 100644
--- a/components/download/internal/background_service/test/entry_utils.cc
+++ b/components/download/internal/background_service/test/entry_utils.cc
@@ -3,8 +3,10 @@
// found in the LICENSE file.
#include "components/download/internal/background_service/test/entry_utils.h"
+
+#include <algorithm>
+
#include "base/memory/values_equivalent.h"
-#include "base/ranges/algorithm.h"
#include "base/uuid.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
@@ -17,12 +19,12 @@
bool CompareEntryList(const std::vector<Entry*>& expected,
const std::vector<Entry*>& actual) {
- return base::ranges::is_permutation(actual, expected, CompareEntry);
+ return std::ranges::is_permutation(actual, expected, CompareEntry);
}
bool CompareEntryList(const std::vector<Entry>& list1,
const std::vector<Entry>& list2) {
- return base::ranges::is_permutation(list1, list2);
+ return std::ranges::is_permutation(list1, list2);
}
bool CompareEntryUsingGuidOnly(const Entry* const& expected,
@@ -35,8 +37,8 @@
bool CompareEntryListUsingGuidOnly(const std::vector<Entry*>& expected,
const std::vector<Entry*>& actual) {
- return base::ranges::is_permutation(actual, expected,
- CompareEntryUsingGuidOnly);
+ return std::ranges::is_permutation(actual, expected,
+ CompareEntryUsingGuidOnly);
}
Entry BuildBasicEntry() {
diff --git a/components/drive/resource_metadata_storage_unittest.cc b/components/drive/resource_metadata_storage_unittest.cc
index e6be7f3..23f46c0 100644
--- a/components/drive/resource_metadata_storage_unittest.cc
+++ b/components/drive/resource_metadata_storage_unittest.cc
@@ -7,13 +7,13 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <array>
#include <utility>
#include "base/containers/contains.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/task/single_thread_task_runner.h"
#include "components/drive/drive.pb.h"
@@ -290,7 +290,7 @@
storage_->GetChildren(parents_id[i], &children);
EXPECT_EQ(children_name_id[i].size(), children.size());
for (const auto& id : children_name_id[i]) {
- EXPECT_EQ(1, base::ranges::count(children, id.second));
+ EXPECT_EQ(1, std::ranges::count(children, id.second));
}
}
}
diff --git a/components/drive/service/fake_drive_service_unittest.cc b/components/drive/service/fake_drive_service_unittest.cc
index def0527..2e7190e 100644
--- a/components/drive/service/fake_drive_service_unittest.cc
+++ b/components/drive/service/fake_drive_service_unittest.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <string>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/functional/bind.h"
#include "base/hash/md5.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -1184,7 +1184,7 @@
ASSERT_TRUE(base::ReadFileToString(output_file_path, &content));
EXPECT_EQ("This is some test content.", content);
ASSERT_TRUE(!download_progress_values.empty());
- EXPECT_TRUE(base::ranges::is_sorted(download_progress_values));
+ EXPECT_TRUE(std::ranges::is_sorted(download_progress_values));
EXPECT_LE(0, download_progress_values.front().first);
EXPECT_GE(26, download_progress_values.back().first);
EXPECT_EQ(content, get_content_callback.GetConcatenatedData());
@@ -2006,7 +2006,7 @@
EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
EXPECT_FALSE(entry);
ASSERT_TRUE(!upload_progress_values.empty());
- EXPECT_TRUE(base::ranges::is_sorted(upload_progress_values));
+ EXPECT_TRUE(std::ranges::is_sorted(upload_progress_values));
EXPECT_LE(0, upload_progress_values.front().first);
EXPECT_GE(static_cast<int64_t>(contents.size() / 2),
upload_progress_values.back().first);
@@ -2025,7 +2025,7 @@
EXPECT_EQ(static_cast<int64_t>(contents.size()), entry->file_size());
EXPECT_TRUE(Exists(entry->file_id()));
ASSERT_TRUE(!upload_progress_values.empty());
- EXPECT_TRUE(base::ranges::is_sorted(upload_progress_values));
+ EXPECT_TRUE(std::ranges::is_sorted(upload_progress_values));
EXPECT_LE(0, upload_progress_values.front().first);
EXPECT_GE(static_cast<int64_t>(contents.size() - contents.size() / 2),
upload_progress_values.back().first);
@@ -2068,7 +2068,7 @@
EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
EXPECT_FALSE(entry);
ASSERT_TRUE(!upload_progress_values.empty());
- EXPECT_TRUE(base::ranges::is_sorted(upload_progress_values));
+ EXPECT_TRUE(std::ranges::is_sorted(upload_progress_values));
EXPECT_LE(0, upload_progress_values.front().first);
EXPECT_GE(static_cast<int64_t>(contents.size() / 2),
upload_progress_values.back().first);
@@ -2087,7 +2087,7 @@
EXPECT_EQ(static_cast<int64_t>(contents.size()), entry->file_size());
EXPECT_TRUE(Exists(entry->file_id()));
ASSERT_TRUE(!upload_progress_values.empty());
- EXPECT_TRUE(base::ranges::is_sorted(upload_progress_values));
+ EXPECT_TRUE(std::ranges::is_sorted(upload_progress_values));
EXPECT_LE(0, upload_progress_values.front().first);
EXPECT_GE(static_cast<int64_t>(contents.size() - contents.size() / 2),
upload_progress_values.back().first);
diff --git a/components/enterprise/browser/controller/browser_dm_token_storage.cc b/components/enterprise/browser/controller/browser_dm_token_storage.cc
index 73853f5..0d3ab4e 100644
--- a/components/enterprise/browser/controller/browser_dm_token_storage.cc
+++ b/components/enterprise/browser/controller/browser_dm_token_storage.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -16,7 +17,6 @@
#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/syslog_logging.h"
@@ -194,7 +194,7 @@
}
// checks if client ID includes an illegal character
- if (base::ranges::any_of(client_id_, [](char ch) {
+ if (std::ranges::any_of(client_id_, [](char ch) {
return ch == ' ' || !base::IsAsciiPrintable(ch);
})) {
SYSLOG(ERROR)
diff --git a/components/enterprise/connectors/core/common.cc b/components/enterprise/connectors/core/common.cc
index 623386c..00fe703e 100644
--- a/components/enterprise/connectors/core/common.cc
+++ b/components/enterprise/connectors/core/common.cc
@@ -4,8 +4,9 @@
#include "components/enterprise/connectors/core/common.h"
+#include <algorithm>
+
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
@@ -292,7 +293,7 @@
#endif // BUILDFLAG(USE_BLINK)
bool ContainsMalwareVerdict(const ContentAnalysisResponse& response) {
- return base::ranges::any_of(response.results(), [](const auto& result) {
+ return std::ranges::any_of(response.results(), [](const auto& result) {
return result.tag() == kMalwareTag && !result.triggered_rules().empty();
});
}
diff --git a/components/enterprise/idle/action_type.cc b/components/enterprise/idle/action_type.cc
index d9c559e..5524e50 100644
--- a/components/enterprise/idle/action_type.cc
+++ b/components/enterprise/idle/action_type.cc
@@ -4,6 +4,7 @@
#include "components/enterprise/idle/action_type.h"
+#include <algorithm>
#include <cstring>
#include <string>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/containers/span.h"
#include "base/functional/bind.h"
#include "base/json/values_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -103,11 +103,11 @@
std::vector<ActionType> GetActionTypesFromPrefs(PrefService* prefs) {
std::vector<ActionType> actions;
- base::ranges::transform(prefs->GetList(prefs::kIdleTimeoutActions),
- std::back_inserter(actions),
- [](const base::Value& action) {
- return static_cast<ActionType>(action.GetInt());
- });
+ std::ranges::transform(prefs->GetList(prefs::kIdleTimeoutActions),
+ std::back_inserter(actions),
+ [](const base::Value& action) {
+ return static_cast<ActionType>(action.GetInt());
+ });
return actions;
}
diff --git a/components/enterprise/idle/idle_timeout_policy_handler_unittest.cc b/components/enterprise/idle/idle_timeout_policy_handler_unittest.cc
index c3670c2e..f80cc59 100644
--- a/components/enterprise/idle/idle_timeout_policy_handler_unittest.cc
+++ b/components/enterprise/idle/idle_timeout_policy_handler_unittest.cc
@@ -4,12 +4,12 @@
#include "components/enterprise/idle/idle_timeout_policy_handler.h"
+#include <algorithm>
#include <iterator>
#include <string>
#include <vector>
#include "base/json/values_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
@@ -53,7 +53,7 @@
timeout_handler_.CheckPolicySettings(policies_, &errors_),
actions_handler_.CheckPolicySettings(policies_, &errors_),
};
- return base::ranges::all_of(base::span(results), std::identity{});
+ return std::ranges::all_of(base::span(results), std::identity{});
}
void ApplyPolicySettings() {
@@ -73,8 +73,8 @@
std::vector<std::u16string> errors() {
std::vector<std::u16string> strings;
- base::ranges::transform(errors_, std::back_inserter(strings),
- [](const auto& it) { return it.second.message; });
+ std::ranges::transform(errors_, std::back_inserter(strings),
+ [](const auto& it) { return it.second.message; });
return strings;
}
diff --git a/components/exo/client_controlled_shell_surface.cc b/components/exo/client_controlled_shell_surface.cc
index f20cc731..e9009a0 100644
--- a/components/exo/client_controlled_shell_surface.cc
+++ b/components/exo/client_controlled_shell_surface.cc
@@ -832,7 +832,7 @@
// Android has an obsolete bounds for a while and applies it incorrectly.
// We need to ignore those bounds change until the states are completely
// synced on both sides.
- const bool any_displays_rotated = base::ranges::any_of(
+ const bool any_displays_rotated = std::ranges::any_of(
configuration_change.display_metrics_changes,
[](const DisplayManagerObserver::DisplayMetricsChange& change) {
return change.changed_metrics &
@@ -848,7 +848,7 @@
// Early return if no display changes are relevant to the shell surface's host
// display.
- const auto host_display_change = base::ranges::find(
+ const auto host_display_change = std::ranges::find(
configuration_change.display_metrics_changes, output_display_id(),
[](const DisplayManagerObserver::DisplayMetricsChange& change) {
return change.display->id();
diff --git a/components/exo/keyboard.cc b/components/exo/keyboard.cc
index 5ae225e..d3ecf02 100644
--- a/components/exo/keyboard.cc
+++ b/components/exo/keyboard.cc
@@ -9,6 +9,8 @@
#include "components/exo/keyboard.h"
+#include <algorithm>
+
#include "ash/accelerators/accelerator_controller_impl.h"
#include "ash/accelerators/accelerator_table.h"
#include "ash/constants/ash_features.h"
@@ -24,7 +26,6 @@
#include "base/containers/span.h"
#include "base/functional/bind.h"
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "chromeos/ui/base/app_types.h"
@@ -351,7 +352,7 @@
}
auto& key_state_set = key_state_set_iter->second;
- auto key_state_iter = base::ranges::find(
+ auto key_state_iter = std::ranges::find(
key_state_set, event->code(),
[](const KeyState& key_state) { return key_state.code; });
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index e2ca9cb..df13cfc 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -619,7 +619,7 @@
// Keep client surface coordinates in sync with the server when display
// layouts change.
- const bool should_update_window_position = base::ranges::any_of(
+ const bool should_update_window_position = std::ranges::any_of(
configuration_change.display_metrics_changes,
[id = output_display_id()](
const DisplayManagerObserver::DisplayMetricsChange& change) {
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index db6a672..62e2d26 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -4,6 +4,7 @@
#include "components/exo/surface.h"
+#include <algorithm>
#include <utility>
#include "ash/display/output_protection_delegate.h"
@@ -18,7 +19,6 @@
#include "base/not_fatal_until.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/system/sys_info.h"
#include "base/trace_event/trace_event.h"
@@ -100,7 +100,7 @@
// with |key|.
template <typename T, typename U>
typename T::iterator FindListEntry(T& list, U key) {
- return base::ranges::find(list, key, &T::value_type::first);
+ return std::ranges::find(list, key, &T::value_type::first);
}
// Helper function that returns true if |list| contains an entry with |key|.
diff --git a/components/exo/surface_tree_host.cc b/components/exo/surface_tree_host.cc
index 53d4059..d42e206 100644
--- a/components/exo/surface_tree_host.cc
+++ b/components/exo/surface_tree_host.cc
@@ -284,7 +284,7 @@
void SurfaceTreeHost::OnDidProcessDisplayChanges(
const DisplayConfigurationChange& configuration_change) {
// The output of the surface may change when the primary display changes.
- const bool primary_changed = base::ranges::any_of(
+ const bool primary_changed = std::ranges::any_of(
configuration_change.display_metrics_changes,
[](const DisplayManagerObserver::DisplayMetricsChange& change) {
return change.changed_metrics &
diff --git a/components/exo/touch.cc b/components/exo/touch.cc
index 0ca72f4..55402438 100644
--- a/components/exo/touch.cc
+++ b/components/exo/touch.cc
@@ -4,7 +4,8 @@
#include "components/exo/touch.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/trace_event/trace_event.h"
#include "components/exo/input_trace.h"
#include "components/exo/seat.h"
@@ -230,7 +231,7 @@
}
void Touch::CancelAllTouches() {
- base::ranges::for_each(surface_touch_count_map_, [this](auto& it) {
+ std::ranges::for_each(surface_touch_count_map_, [this](auto& it) {
it.first->RemoveSurfaceObserver(this);
});
touch_points_surface_map_.clear();
diff --git a/components/exo/wayland/clients/client_base.cc b/components/exo/wayland/clients/client_base.cc
index c2b97c9..a9755a8f 100644
--- a/components/exo/wayland/clients/client_base.cc
+++ b/components/exo/wayland/clients/client_base.cc
@@ -23,6 +23,7 @@
#include <wayland-client-core.h>
#include <wayland-client-protocol.h>
+#include <algorithm>
#include <cstdint>
#include <memory>
#include <string>
@@ -38,7 +39,6 @@
#include "base/memory/shared_memory_mapper.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/posix/eintr_wrapper.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -1909,7 +1909,7 @@
ClientBase::Buffer* ClientBase::DequeueBuffer() {
auto buffer_it =
- base::ranges::find_if_not(buffers_, &ClientBase::Buffer::busy);
+ std::ranges::find_if_not(buffers_, &ClientBase::Buffer::busy);
if (buffer_it == buffers_.end())
return nullptr;
diff --git a/components/exo/wayland/clients/rects.cc b/components/exo/wayland/clients/rects.cc
index 8f081d8a..1175f12 100644
--- a/components/exo/wayland/clients/rects.cc
+++ b/components/exo/wayland/clients/rects.cc
@@ -16,6 +16,7 @@
#include <wayland-client-core.h>
#include <wayland-client-protocol.h>
+#include <algorithm>
#include <cmath>
#include <iostream>
#include <memory>
@@ -29,7 +30,6 @@
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/scoped_generic.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_executor.h"
@@ -208,7 +208,7 @@
struct wp_presentation_feedback* presentation_feedback) {
Presentation* presentation = static_cast<Presentation*>(data);
DCHECK_GT(presentation->scheduled_frames.size(), 0u);
- auto it = base::ranges::find(
+ auto it = std::ranges::find(
presentation->scheduled_frames, presentation_feedback,
[](std::unique_ptr<Frame>& frame) { return frame->feedback.get(); });
CHECK(it != presentation->scheduled_frames.end(), base::NotFatalUntil::M130);
diff --git a/components/exo/wayland/clients/simple.cc b/components/exo/wayland/clients/simple.cc
index 051940e5..f848166 100644
--- a/components/exo/wayland/clients/simple.cc
+++ b/components/exo/wayland/clients/simple.cc
@@ -12,6 +12,7 @@
#include <presentation-time-client-protocol.h>
#include <single-pixel-buffer-v1-client-protocol.h>
+#include <algorithm>
#include <climits>
#include <cstdint>
#include <iostream>
@@ -19,7 +20,6 @@
#include "base/command_line.h"
#include "base/containers/circular_deque.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/exo/wayland/clients/client_helper.h"
#include "third_party/skia/include/core/SkCanvas.h"
@@ -81,8 +81,8 @@
Presentation* presentation = static_cast<Presentation*>(data);
DCHECK_GT(presentation->submitted_frames.size(), 0u);
auto it =
- base::ranges::find(presentation->submitted_frames, feedback,
- [](Frame& frame) { return frame.feedback.get(); });
+ std::ranges::find(presentation->submitted_frames, feedback,
+ [](Frame& frame) { return frame.feedback.get(); });
CHECK(it != presentation->submitted_frames.end(), base::NotFatalUntil::M130);
presentation->submitted_frames.erase(it);
}
diff --git a/components/exo/wayland/output_controller.cc b/components/exo/wayland/output_controller.cc
index 75303b9..904a5d8 100644
--- a/components/exo/wayland/output_controller.cc
+++ b/components/exo/wayland/output_controller.cc
@@ -9,9 +9,10 @@
#include <wayland-server-core.h>
#include <xdg-output-unstable-v1-server-protocol.h>
+#include <algorithm>
+
#include "ash/shell.h"
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "components/exo/wayland/output_configuration_change.h"
#include "components/exo/wayland/wayland_display_output.h"
#include "components/exo/wayland/wl_output.h"
@@ -132,8 +133,8 @@
WaylandOutputList OutputController::GetActiveOutputs() const {
WaylandOutputList output_list;
- base::ranges::transform(outputs_, std::back_inserter(output_list),
- [](auto& pair) { return pair.second.get(); });
+ std::ranges::transform(outputs_, std::back_inserter(output_list),
+ [](auto& pair) { return pair.second.get(); });
return output_list;
}
@@ -141,13 +142,12 @@
const DisplayConfigurationChange& configuration_change) {
OutputConfigurationChange output_config_change;
- base::ranges::transform(
- configuration_change.added_displays,
- std::back_inserter(output_config_change.added_outputs),
- [this](const display::Display& display) {
- return GetWaylandDisplayOutput(display.id());
- });
- base::ranges::transform(
+ std::ranges::transform(configuration_change.added_displays,
+ std::back_inserter(output_config_change.added_outputs),
+ [this](const display::Display& display) {
+ return GetWaylandDisplayOutput(display.id());
+ });
+ std::ranges::transform(
configuration_change.removed_displays,
std::back_inserter(output_config_change.removed_outputs),
[this](const display::Display& display) {
diff --git a/components/exo/wayland/output_metrics.cc b/components/exo/wayland/output_metrics.cc
index 025e035..5204eb7 100644
--- a/components/exo/wayland/output_metrics.cc
+++ b/components/exo/wayland/output_metrics.cc
@@ -38,7 +38,7 @@
std::vector<float> zoom_factors = display::GetDisplayZoomFactors(active_mode);
// Ensure that the current zoom factor is a part of the list.
- if (base::ranges::none_of(zoom_factors, [&display_info](float zoom_factor) {
+ if (std::ranges::none_of(zoom_factors, [&display_info](float zoom_factor) {
return std::abs(display_info.zoom_factor() - zoom_factor) <=
std::numeric_limits<float>::epsilon();
})) {
diff --git a/components/exo/wayland/test/integration/buffer_checker_test.cc b/components/exo/wayland/test/integration/buffer_checker_test.cc
index a8af9f0..a340877b 100644
--- a/components/exo/wayland/test/integration/buffer_checker_test.cc
+++ b/components/exo/wayland/test/integration/buffer_checker_test.cc
@@ -11,6 +11,7 @@
#include <gbm.h>
#include <sys/mman.h>
+#include <algorithm>
#include <cstdint>
#include <iterator>
#include <vector>
@@ -19,7 +20,6 @@
#include "base/containers/flat_map.h"
#include "base/containers/queue.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/test/task_environment.h"
#include "components/exo/wayland/clients/client_base.h"
@@ -104,9 +104,9 @@
do {
if (usages_to_test.size() == 0) {
std::vector<std::string> supported_usage_strings;
- base::ranges::transform(supported_usages,
- std::back_inserter(supported_usage_strings),
- gfx::BufferUsageToString);
+ std::ranges::transform(supported_usages,
+ std::back_inserter(supported_usage_strings),
+ gfx::BufferUsageToString);
LOG(INFO) << "Successfully used buffer with format drm: "
<< DrmCodeToString(format) << " gfx::BufferFormat: "
<< DrmCodeToBufferFormatString(format)
diff --git a/components/exo/wayland/wl_shm.cc b/components/exo/wayland/wl_shm.cc
index 637dde7..0d894c6 100644
--- a/components/exo/wayland/wl_shm.cc
+++ b/components/exo/wayland/wl_shm.cc
@@ -6,8 +6,9 @@
#include <wayland-server-protocol-core.h>
+#include <algorithm>
+
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "components/exo/buffer.h"
#include "components/exo/display.h"
#include "components/exo/shared_memory.h"
@@ -45,7 +46,7 @@
int32_t height,
int32_t stride,
uint32_t format) {
- const auto* supported_format = base::ranges::find(
+ const auto* supported_format = std::ranges::find(
shm_supported_formats, format, &shm_supported_format::shm_format);
if (supported_format == std::end(shm_supported_formats)) {
wl_resource_post_error(resource, WL_SHM_ERROR_INVALID_FORMAT,
diff --git a/components/exo/wayland/zaura_shell.cc b/components/exo/wayland/zaura_shell.cc
index 7ec52d46..c77b012 100644
--- a/components/exo/wayland/zaura_shell.cc
+++ b/components/exo/wayland/zaura_shell.cc
@@ -8,6 +8,7 @@
#include <wayland-server-protocol-core.h>
#include <xdg-shell-server-protocol.h>
+#include <algorithm>
#include <limits>
#include <memory>
#include <string_view>
@@ -28,7 +29,6 @@
#include "base/bit_cast.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chromeos/constants/chromeos_features.h"
diff --git a/components/exo/wayland/zaura_shell_unittest.cc b/components/exo/wayland/zaura_shell_unittest.cc
index 06a48ae..80359d1 100644
--- a/components/exo/wayland/zaura_shell_unittest.cc
+++ b/components/exo/wayland/zaura_shell_unittest.cc
@@ -813,7 +813,7 @@
};
OutputHolder* GetOutputHolder(int64_t display_id) {
- auto iter = base::ranges::find_if(
+ auto iter = std::ranges::find_if(
output_holder_list_,
[display_id](const std::unique_ptr<OutputHolder>& holder) {
return holder->output->id() == display_id;
diff --git a/components/facilitated_payments/core/browser/ewallet_manager.cc b/components/facilitated_payments/core/browser/ewallet_manager.cc
index 38367ba..e1fbfe7 100644
--- a/components/facilitated_payments/core/browser/ewallet_manager.cc
+++ b/components/facilitated_payments/core/browser/ewallet_manager.cc
@@ -180,7 +180,7 @@
ShowProgressScreen();
initiate_payment_request_details_->instrument_id_ = selected_instrument_id;
- auto iter_ewallet = base::ranges::find_if(
+ auto iter_ewallet = std::ranges::find_if(
supported_ewallets_, [&](const autofill::Ewallet& ewallet) {
return ewallet.payment_instrument().instrument_id() ==
selected_instrument_id;
diff --git a/components/favicon/content/favicon_url_util.cc b/components/favicon/content/favicon_url_util.cc
index 46c885ff..dfcba23b 100644
--- a/components/favicon/content/favicon_url_util.cc
+++ b/components/favicon/content/favicon_url_util.cc
@@ -4,9 +4,9 @@
#include "components/favicon/content/favicon_url_util.h"
+#include <algorithm>
#include <iterator>
-#include "base/ranges/algorithm.h"
#include "components/favicon/core/favicon_url.h"
#include "components/favicon_base/favicon_types.h"
@@ -41,8 +41,8 @@
const std::vector<blink::mojom::FaviconURLPtr>& favicon_urls) {
std::vector<FaviconURL> result;
result.reserve(favicon_urls.size());
- base::ranges::transform(favicon_urls, std::back_inserter(result),
- FaviconURLFromContentFaviconURL);
+ std::ranges::transform(favicon_urls, std::back_inserter(result),
+ FaviconURLFromContentFaviconURL);
return result;
}
diff --git a/components/favicon/core/favicon_handler.cc b/components/favicon/core/favicon_handler.cc
index ce52402..4e75035 100644
--- a/components/favicon/core/favicon_handler.cc
+++ b/components/favicon/core/favicon_handler.cc
@@ -4,6 +4,7 @@
#include "components/favicon/core/favicon_handler.h"
+#include <algorithm>
#include <cmath>
#include <utility>
#include <vector>
@@ -15,7 +16,6 @@
#include "base/memory/ref_counted_memory.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/favicon/core/core_favicon_service.h"
#include "components/favicon_base/favicon_util.h"
@@ -42,8 +42,8 @@
return false;
// Check if at least one of the bitmaps is expired.
- if (base::ranges::any_of(bitmap_results,
- &favicon_base::FaviconRawBitmapResult::expired)) {
+ if (std::ranges::any_of(bitmap_results,
+ &favicon_base::FaviconRawBitmapResult::expired)) {
return true;
}
@@ -75,8 +75,8 @@
// Returns true if at least one of `bitmap_results` is valid.
bool HasValidResult(
const std::vector<favicon_base::FaviconRawBitmapResult>& bitmap_results) {
- return base::ranges::any_of(bitmap_results,
- &favicon_base::FaviconRawBitmapResult::is_valid);
+ return std::ranges::any_of(bitmap_results,
+ &favicon_base::FaviconRawBitmapResult::is_valid);
}
std::vector<int> GetDesiredPixelSizes(
@@ -108,7 +108,7 @@
// invalid size by the 'sizes' parser (see for example `WebIconSizesParser` in
// Blink).
bool HasAnySize(const std::vector<gfx::Size>& icon_sizes) {
- return base::ranges::any_of(icon_sizes, &gfx::Size::IsZero);
+ return std::ranges::any_of(icon_sizes, &gfx::Size::IsZero);
}
} // namespace
@@ -331,8 +331,8 @@
// `candidates or `manifest_url` could have been modified via Javascript. If
// neither changed, ignore the call.
if (candidates_received_ && manifest_url_ == manifest_url &&
- base::ranges::equal(candidates, non_manifest_original_candidates_,
- &FaviconURLEquals)) {
+ std::ranges::equal(candidates, non_manifest_original_candidates_,
+ &FaviconURLEquals)) {
return;
}
diff --git a/components/favicon/ios/favicon_url_util.cc b/components/favicon/ios/favicon_url_util.cc
index 7089a884..ab28633a 100644
--- a/components/favicon/ios/favicon_url_util.cc
+++ b/components/favicon/ios/favicon_url_util.cc
@@ -4,10 +4,10 @@
#include "components/favicon/ios/favicon_url_util.h"
+#include <algorithm>
#include <iterator>
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/favicon/core/favicon_url.h"
#include "components/favicon_base/favicon_types.h"
#include "ios/web/public/favicon/favicon_url.h"
@@ -45,8 +45,8 @@
const std::vector<web::FaviconURL>& favicon_urls) {
std::vector<FaviconURL> result;
result.reserve(favicon_urls.size());
- base::ranges::transform(favicon_urls, std::back_inserter(result),
- FaviconURLFromWebFaviconURL);
+ std::ranges::transform(favicon_urls, std::back_inserter(result),
+ FaviconURLFromWebFaviconURL);
return result;
}
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc
index e17e411f..c5f40aa 100644
--- a/components/favicon_base/favicon_util.cc
+++ b/components/favicon_base/favicon_util.cc
@@ -6,9 +6,9 @@
#include <stddef.h>
+#include <algorithm>
#include <cmath>
-#include "base/ranges/algorithm.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
#include "components/favicon_base/favicon_types.h"
@@ -190,7 +190,7 @@
std::vector<float> favicon_scales_to_generate = favicon_scales;
for (auto& png_rep : png_reps) {
- auto iter = base::ranges::find(favicon_scales_to_generate, png_rep.scale);
+ auto iter = std::ranges::find(favicon_scales_to_generate, png_rep.scale);
if (iter != favicon_scales_to_generate.end()) {
favicon_scales_to_generate.erase(iter);
}
diff --git a/components/feed/core/v2/feed_stream.cc b/components/feed/core/v2/feed_stream.cc
index 0d828ee..9957e4e 100644
--- a/components/feed/core/v2/feed_stream.cc
+++ b/components/feed/core/v2/feed_stream.cc
@@ -20,7 +20,6 @@
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "build/buildflag.h"
@@ -496,8 +495,7 @@
void FeedStream::CleanupDestroyedSurfaces() {
auto to_remove = std::ranges::remove_if(
all_surfaces_, [&](const FeedStreamSurface& surface) {
- return base::ranges::find(destroyed_surfaces_,
- surface.GetSurfaceId()) !=
+ return std::ranges::find(destroyed_surfaces_, surface.GetSurfaceId()) !=
destroyed_surfaces_.end();
});
all_surfaces_.erase(to_remove.begin(), to_remove.end());
diff --git a/components/feed/core/v2/view_demotion.cc b/components/feed/core/v2/view_demotion.cc
index 74f64848..4130b46c 100644
--- a/components/feed/core/v2/view_demotion.cc
+++ b/components/feed/core/v2/view_demotion.cc
@@ -16,7 +16,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/feed/core/proto/v2/store.pb.h"
#include "components/feed/core/v2/config.h"
@@ -87,7 +86,7 @@
}
}
- base::ranges::sort(latest_view_to_docid);
+ std::ranges::sort(latest_view_to_docid);
std::vector<uint64_t> docids_to_remove;
docids_to_remove.reserve(remove_count);
diff --git a/components/feed/core/v2/web_feed_subscription_coordinator.cc b/components/feed/core/v2/web_feed_subscription_coordinator.cc
index fb9ae0d..044f678 100644
--- a/components/feed/core/v2/web_feed_subscription_coordinator.cc
+++ b/components/feed/core/v2/web_feed_subscription_coordinator.cc
@@ -4,6 +4,7 @@
#include "components/feed/core/v2/web_feed_subscription_coordinator.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include <ostream>
@@ -13,7 +14,6 @@
#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
#include "components/feed/core/common/pref_names.h"
@@ -867,7 +867,7 @@
}
// Remove duplicates, and fetch WebFeed status.
- base::ranges::sort(result);
+ std::ranges::sort(result);
auto repeated = std::ranges::unique(result);
result.erase(repeated.begin(), repeated.end());
for (auto& entry : result) {
diff --git a/components/feedback/feedback_common.cc b/components/feedback/feedback_common.cc
index 7d69567..eccbc2e 100644
--- a/components/feedback/feedback_common.cc
+++ b/components/feedback/feedback_common.cc
@@ -4,12 +4,12 @@
#include "components/feedback/feedback_common.h"
+#include <algorithm>
#include <utility>
#include "base/files/file_path.h"
#include "base/json/json_reader.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "base/values.h"
#include "components/feedback/feedback_constants.h"
#include "components/feedback/feedback_report.h"
@@ -61,7 +61,7 @@
bool BelowCompressionThreshold(const std::string& content) {
if (content.length() > kFeedbackMaxLength)
return false;
- const size_t line_count = base::ranges::count(content, '\n');
+ const size_t line_count = std::ranges::count(content, '\n');
if (line_count > kFeedbackMaxLineCount)
return false;
return true;
diff --git a/components/feedback/redaction_tool/ip_address.cc b/components/feedback/redaction_tool/ip_address.cc
index a26379e..52f292c 100644
--- a/components/feedback/redaction_tool/ip_address.cc
+++ b/components/feedback/redaction_tool/ip_address.cc
@@ -20,7 +20,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"
@@ -113,7 +112,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/components/feedback/redaction_tool/redaction_tool_unittest.cc b/components/feedback/redaction_tool/redaction_tool_unittest.cc
index e25e3a6..0b86ad06 100644
--- a/components/feedback/redaction_tool/redaction_tool_unittest.cc
+++ b/components/feedback/redaction_tool/redaction_tool_unittest.cc
@@ -762,7 +762,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;
diff --git a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc
index faef39e..309b713 100644
--- a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc
+++ b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc
@@ -4,6 +4,8 @@
#include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
+#include <algorithm>
+
#include "base/files/file_util.h"
#include "base/functional/bind.h"
#include "base/json/json_reader.h"
@@ -11,7 +13,6 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/components/global_media_controls/public/media_session_item_producer.cc b/components/global_media_controls/public/media_session_item_producer.cc
index 6f4c3eb..93b61911 100644
--- a/components/global_media_controls/public/media_session_item_producer.cc
+++ b/components/global_media_controls/public/media_session_item_producer.cc
@@ -85,7 +85,7 @@
void MediaSessionItemProducer::Session::MediaSessionActionsChanged(
const std::vector<media_session::mojom::MediaSessionAction>& actions) {
bool is_audio_device_switching_supported =
- base::ranges::find(
+ std::ranges::find(
actions,
media_session::mojom::MediaSessionAction::kSwitchAudioDevice) !=
actions.end();
diff --git a/components/global_media_controls/public/media_session_notification_item.cc b/components/global_media_controls/public/media_session_notification_item.cc
index 48adec10..d75092a 100644
--- a/components/global_media_controls/public/media_session_notification_item.cc
+++ b/components/global_media_controls/public/media_session_notification_item.cc
@@ -4,11 +4,12 @@
#include "components/global_media_controls/public/media_session_notification_item.h"
+#include <algorithm>
+
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/global_media_controls/public/constants.h"
#include "components/media_message_center/media_notification_util.h"
@@ -572,8 +573,8 @@
bool MediaSessionNotificationItem::FrozenWithChapterArtwork() {
auto it =
- base::ranges::find_if(frozen_with_chapter_artwork_,
- [](const auto& it) { return it.second == true; });
+ std::ranges::find_if(frozen_with_chapter_artwork_,
+ [](const auto& it) { return it.second == true; });
return it != frozen_with_chapter_artwork_.end();
}
} // namespace global_media_controls
diff --git a/components/global_media_controls/public/views/media_item_ui_detailed_view.cc b/components/global_media_controls/public/views/media_item_ui_detailed_view.cc
index 5c90724..e2447ce 100644
--- a/components/global_media_controls/public/views/media_item_ui_detailed_view.cc
+++ b/components/global_media_controls/public/views/media_item_ui_detailed_view.cc
@@ -916,8 +916,8 @@
views::Button* MediaItemUIDetailedView::GetActionButtonForTesting(
media_session::mojom::MediaSessionAction action) {
- const auto i = base::ranges::find(action_buttons_, static_cast<int>(action),
- &views::View::GetID);
+ const auto i = std::ranges::find(action_buttons_, static_cast<int>(action),
+ &views::View::GetID);
return (i == action_buttons_.end()) ? nullptr : *i;
}
diff --git a/components/global_media_controls/public/views/media_item_ui_updated_view.cc b/components/global_media_controls/public/views/media_item_ui_updated_view.cc
index a0be28b..ec52a8c 100644
--- a/components/global_media_controls/public/views/media_item_ui_updated_view.cc
+++ b/components/global_media_controls/public/views/media_item_ui_updated_view.cc
@@ -789,7 +789,7 @@
MediaActionButton* MediaItemUIUpdatedView::GetMediaActionButtonForTesting(
MediaSessionAction action) {
- const auto i = base::ranges::find(
+ const auto i = std::ranges::find(
media_action_buttons_, static_cast<int>(action), &views::View::GetID);
return (i == media_action_buttons_.end()) ? nullptr : *i;
}
diff --git a/components/history/core/browser/expire_history_backend.cc b/components/history/core/browser/expire_history_backend.cc
index 362db78..63460e5 100644
--- a/components/history/core/browser/expire_history_backend.cc
+++ b/components/history/core/browser/expire_history_backend.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <functional>
#include <limits>
#include <memory>
@@ -20,7 +21,6 @@
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "build/build_config.h"
#include "components/favicon/core/favicon_database.h"
@@ -272,7 +272,7 @@
// `times` must be in reverse chronological order and have no
// duplicates, i.e. each member must be earlier than the one before
// it.
- DCHECK(base::ranges::adjacent_find(times, std::less_equal<base::Time>()) ==
+ DCHECK(std::ranges::adjacent_find(times, std::less_equal<base::Time>()) ==
times.end());
if (!main_db_)
diff --git a/components/history/core/browser/expire_history_backend_unittest.cc b/components/history/core/browser/expire_history_backend_unittest.cc
index 0ee8a288..ff88acb 100644
--- a/components/history/core/browser/expire_history_backend_unittest.cc
+++ b/components/history/core/browser/expire_history_backend_unittest.cc
@@ -11,6 +11,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -20,7 +21,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/strings/utf_string_conversions.h"
@@ -330,7 +330,7 @@
EXPECT_EQ(expired, info.is_from_expiration());
const history::URLRows& rows(info.deleted_rows());
auto it_row =
- base::ranges::find_if(rows, history::URLRow::URLRowHasURL(row.url()));
+ std::ranges::find_if(rows, history::URLRow::URLRowHasURL(row.url()));
if (it_row != rows.end()) {
// Further verify that the ID is set to what had been in effect in the
// main database before the deletion. The InMemoryHistoryBackend relies
@@ -342,7 +342,7 @@
for (const auto& pair : urls_modified_notifications_) {
const auto& rows = pair.second;
EXPECT_TRUE(
- base::ranges::none_of(rows, history::URLRow::URLRowHasURL(row.url())));
+ std::ranges::none_of(rows, history::URLRow::URLRowHasURL(row.url())));
}
EXPECT_TRUE(found_delete_notification);
}
@@ -364,7 +364,7 @@
const bool is_from_expiration = pair.first;
const auto& rows = pair.second;
if (is_from_expiration == should_be_from_expiration &&
- base::ranges::any_of(rows, history::URLRow::URLRowHasURL(url))) {
+ std::ranges::any_of(rows, history::URLRow::URLRowHasURL(url))) {
return true;
}
}
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
index 8ca54942..c2c8787f 100644
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
@@ -2439,7 +2439,7 @@
visit_ids, /*compute_redirect_chain_start_properties=*/false);
std::vector<ClusterVisit> cluster_visits;
std::set<VisitID> seen_duplicate_ids;
- base::ranges::for_each(annotated_visits, [&](const auto& annotated_visit) {
+ std::ranges::for_each(annotated_visits, [&](const auto& annotated_visit) {
ClusterVisit cluster_visit =
db_->GetClusterVisit(annotated_visit.visit_row.visit_id);
// `cluster_visit` should be valid in the normal flow, but DB corruption can
@@ -2451,7 +2451,7 @@
cluster_visit.duplicate_visits = ToDuplicateClusterVisits(
db_->GetDuplicateClusterVisitIdsForClusterVisit(
annotated_visit.visit_row.visit_id));
- base::ranges::for_each(
+ std::ranges::for_each(
cluster_visit.duplicate_visits, [&](const auto& duplicate_visit) {
seen_duplicate_ids.insert(duplicate_visit.visit_id);
});
diff --git a/components/history/core/browser/history_backend_unittest.cc b/components/history/core/browser/history_backend_unittest.cc
index e4cfb10..0784b0f 100644
--- a/components/history/core/browser/history_backend_unittest.cc
+++ b/components/history/core/browser/history_backend_unittest.cc
@@ -11,6 +11,7 @@
#include <stddef.h>
+#include <algorithm>
#include <array>
#include <iterator>
#include <limits>
@@ -26,7 +27,6 @@
#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -1352,17 +1352,17 @@
EXPECT_EQ(3u, changed_urls.size());
auto it_row1 =
- base::ranges::find_if(changed_urls, URLRow::URLRowHasURL(row1.url()));
+ std::ranges::find_if(changed_urls, URLRow::URLRowHasURL(row1.url()));
ASSERT_NE(changed_urls.end(), it_row1);
EXPECT_EQ(stored_row1.id(), it_row1->id());
auto it_row2 =
- base::ranges::find_if(changed_urls, URLRow::URLRowHasURL(row2.url()));
+ std::ranges::find_if(changed_urls, URLRow::URLRowHasURL(row2.url()));
ASSERT_NE(changed_urls.end(), it_row2);
EXPECT_EQ(stored_row2.id(), it_row2->id());
auto it_row3 =
- base::ranges::find_if(changed_urls, URLRow::URLRowHasURL(row3.url()));
+ std::ranges::find_if(changed_urls, URLRow::URLRowHasURL(row3.url()));
ASSERT_NE(changed_urls.end(), it_row3);
EXPECT_EQ(stored_row3.id(), it_row3->id());
}
diff --git a/components/history/core/browser/history_types.cc b/components/history/core/browser/history_types.cc
index 94f4086..0ae5c91 100644
--- a/components/history/core/browser/history_types.cc
+++ b/components/history/core/browser/history_types.cc
@@ -9,11 +9,11 @@
#include "components/history/core/browser/history_types.h"
+#include <algorithm>
#include <limits>
#include "base/check.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "components/history/core/browser/page_usage_data.h"
@@ -644,7 +644,7 @@
Cluster::~Cluster() = default;
const ClusterVisit& Cluster::GetMostRecentVisit() const {
- return *base::ranges::max_element(
+ return *std::ranges::max_element(
visits, [](auto time1, auto time2) { return time1 < time2; },
[](const auto& cluster_visit) {
return cluster_visit.annotated_visit.visit_row.visit_time;
diff --git a/components/history/core/browser/keyword_search_term_util.cc b/components/history/core/browser/keyword_search_term_util.cc
index f1963a6..b5ae39f 100644
--- a/components/history/core/browser/keyword_search_term_util.cc
+++ b/components/history/core/browser/keyword_search_term_util.cc
@@ -156,7 +156,7 @@
// Populate `search_terms` with the top `count` search terms in descending
// recency or frecency scores.
size_t num_search_terms = std::min(search_terms->size(), count);
- base::ranges::partial_sort(
+ std::ranges::partial_sort(
search_terms->begin(), std::next(search_terms->begin(), num_search_terms),
search_terms->end(), [&](const auto& a, const auto& b) {
return ranking_policy == SearchTermRankingPolicy::kFrecency
@@ -293,7 +293,7 @@
// Populate `search_terms` with the top `count` search terms in descending
// frecency scores.
size_t num_search_terms = std::min(search_terms->size(), count);
- base::ranges::partial_sort(
+ std::ranges::partial_sort(
search_terms->begin(), std::next(search_terms->begin(), num_search_terms),
search_terms->end(),
[](const auto& a, const auto& b) { return a->score > b->score; });
diff --git a/components/history/core/browser/sync/delete_directive_handler.cc b/components/history/core/browser/sync/delete_directive_handler.cc
index 5a13700..e72be3e 100644
--- a/components/history/core/browser/sync/delete_directive_handler.cc
+++ b/components/history/core/browser/sync/delete_directive_handler.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <map>
#include <string>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/values.h"
#include "components/history/core/browser/history_backend.h"
@@ -205,7 +205,7 @@
}
ProcessGlobalIdDeleteDirectives(backend, global_id_directives);
- base::ranges::sort(time_range_directives, TimeRangeLessThan);
+ std::ranges::sort(time_range_directives, TimeRangeLessThan);
ProcessTimeRangeDeleteDirectives(backend, time_range_directives);
ProcessUrlDeleteDirectives(backend, url_directives);
return true;
diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc
index fad882a..813d74d5 100644
--- a/components/history/core/browser/top_sites_impl.cc
+++ b/components/history/core/browser/top_sites_impl.cc
@@ -21,7 +21,6 @@
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_functions.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -64,8 +63,8 @@
// Checks if the titles stored in `old_list` and `new_list` have changes.
bool DoTitlesDiffer(const MostVisitedURLList& old_list,
const MostVisitedURLList& new_list) {
- return !base::ranges::equal(old_list, new_list, std::equal_to<>(),
- &MostVisitedURL::title, &MostVisitedURL::title);
+ return !std::ranges::equal(old_list, new_list, std::equal_to<>(),
+ &MostVisitedURL::title, &MostVisitedURL::title);
}
// Transforms |number| in the range given by |max| and |min| to a number in the
diff --git a/components/history/core/browser/url_utils.cc b/components/history/core/browser/url_utils.cc
index 9ddf6a9..64bae9dc 100644
--- a/components/history/core/browser/url_utils.cc
+++ b/components/history/core/browser/url_utils.cc
@@ -9,7 +9,8 @@
#include "components/history/core/browser/url_utils.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/string_util.h"
#include "url/gurl.h"
diff --git a/components/history/core/browser/visit_annotations_database.cc b/components/history/core/browser/visit_annotations_database.cc
index 67f1f8c..6115d40 100644
--- a/components/history/core/browser/visit_annotations_database.cc
+++ b/components/history/core/browser/visit_annotations_database.cc
@@ -4,11 +4,11 @@
#include "components/history/core/browser/visit_annotations_database.h"
+#include <algorithm>
#include <string>
#include <vector>
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "components/history/core/browser/history_types.h"
@@ -596,7 +596,7 @@
DCHECK_GT(cluster_id, 0);
// Insert each visit into 'clusters_and_visits'.
- base::ranges::for_each(cluster.visits, [&](const auto& cluster_visit) {
+ std::ranges::for_each(cluster.visits, [&](const auto& cluster_visit) {
const auto visit_id = cluster_visit.annotated_visit.visit_row.visit_id;
DCHECK_GT(visit_id, 0);
clusters_and_visits_statement.Reset(true);
@@ -687,7 +687,7 @@
"VALUES(?,?,?,?,?,?,?,?)"));
// Insert each visit into 'clusters_and_visits'.
- base::ranges::for_each(visits, [&](const auto& visit) {
+ std::ranges::for_each(visits, [&](const auto& visit) {
DCHECK_GT(visit.annotated_visit.visit_row.visit_id, 0);
clusters_and_visits_statement.Reset(true);
clusters_and_visits_statement.BindInt64(0, cluster_id);
@@ -741,7 +741,7 @@
"(visit_id,duplicate_visit_id)"
"VALUES(?,?)"));
- base::ranges::for_each(clusters, [&](const auto& cluster) {
+ std::ranges::for_each(clusters, [&](const auto& cluster) {
DCHECK_GT(cluster.cluster_id, 0);
// Update cluster visibility.
@@ -782,7 +782,7 @@
}
}
- base::ranges::for_each(cluster.visits, [&](const auto& cluster_visit) {
+ std::ranges::for_each(cluster.visits, [&](const auto& cluster_visit) {
const auto visit_id = cluster_visit.annotated_visit.visit_row.visit_id;
DCHECK_GT(visit_id, 0);
update_cluster_visit_scores_statement.Reset(true);
diff --git a/components/history/core/test/visit_annotations_test_utils.cc b/components/history/core/test/visit_annotations_test_utils.cc
index a2a1d0a5..3dff40e 100644
--- a/components/history/core/test/visit_annotations_test_utils.cc
+++ b/components/history/core/test/visit_annotations_test_utils.cc
@@ -16,7 +16,7 @@
const std::vector<AnnotatedVisit>& annotated_visits) {
std::vector<VisitID> visit_ids;
visit_ids.reserve(annotated_visits.size());
- base::ranges::transform(
+ std::ranges::transform(
annotated_visits, std::back_inserter(visit_ids),
[](const auto& visit_row) { return visit_row.visit_id; },
&AnnotatedVisit::visit_row);
@@ -27,7 +27,7 @@
const std::vector<ClusterVisit>& cluster_visits) {
std::vector<VisitID> visit_ids;
visit_ids.reserve(cluster_visits.size());
- base::ranges::transform(
+ std::ranges::transform(
cluster_visits, std::back_inserter(visit_ids),
[](const auto& cluster_visit) {
return cluster_visit.annotated_visit.visit_row.visit_id;
@@ -39,7 +39,7 @@
const std::vector<history::Cluster>& clusters) {
std::vector<int64_t> cluster_ids;
cluster_ids.reserve(clusters.size());
- base::ranges::transform(
+ std::ranges::transform(
clusters, std::back_inserter(cluster_ids),
[](const auto& cluster) { return cluster.cluster_id; });
return cluster_ids;
@@ -48,13 +48,13 @@
Cluster CreateCluster(const std::vector<VisitID>& visit_ids) {
Cluster cluster;
cluster.visits.reserve(visit_ids.size());
- base::ranges::transform(visit_ids, std::back_inserter(cluster.visits),
- [](const auto& visit_id) {
- ClusterVisit visit;
- visit.annotated_visit.visit_row.visit_id = visit_id;
- visit.score = 1;
- return visit;
- });
+ std::ranges::transform(visit_ids, std::back_inserter(cluster.visits),
+ [](const auto& visit_id) {
+ ClusterVisit visit;
+ visit.annotated_visit.visit_row.visit_id = visit_id;
+ visit.score = 1;
+ return visit;
+ });
return cluster;
}
@@ -62,8 +62,8 @@
const std::vector<std::vector<int64_t>>& visit_ids_per_cluster) {
std::vector<Cluster> clusters;
clusters.reserve(visit_ids_per_cluster.size());
- base::ranges::transform(visit_ids_per_cluster, std::back_inserter(clusters),
- &CreateCluster);
+ std::ranges::transform(visit_ids_per_cluster, std::back_inserter(clusters),
+ &CreateCluster);
return clusters;
}
diff --git a/components/history_clusters/core/clustering_test_utils.cc b/components/history_clusters/core/clustering_test_utils.cc
index f797f6b1..7ed3251 100644
--- a/components/history_clusters/core/clustering_test_utils.cc
+++ b/components/history_clusters/core/clustering_test_utils.cc
@@ -4,9 +4,9 @@
#include "components/history_clusters/core/clustering_test_utils.h"
+#include <algorithm>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -19,8 +19,8 @@
std::vector<history::VisitID> ExtractDuplicateVisitIds(
std::vector<history::DuplicateClusterVisit> duplicate_visits) {
std::vector<history::VisitID> ids;
- base::ranges::transform(duplicate_visits, std::back_inserter(ids),
- [](const auto& visit) { return visit.visit_id; });
+ std::ranges::transform(duplicate_visits, std::back_inserter(ids),
+ [](const auto& visit) { return visit.visit_id; });
return ids;
}
@@ -44,7 +44,7 @@
std::string VisitResult::ToString() const {
std::vector<std::string> duplicate_visits_strings;
- base::ranges::transform(
+ std::ranges::transform(
duplicate_visits_, std::back_inserter(duplicate_visits_strings),
[&](const auto& duplicate_visit) {
return base::NumberToString(duplicate_visit.visit_id);
diff --git a/components/history_clusters/core/filter_cluster_processor_unittest.cc b/components/history_clusters/core/filter_cluster_processor_unittest.cc
index 87d1b2c..ec8a33d 100644
--- a/components/history_clusters/core/filter_cluster_processor_unittest.cc
+++ b/components/history_clusters/core/filter_cluster_processor_unittest.cc
@@ -92,7 +92,7 @@
history::Cluster has_image_not_known_to_sync = meets_all_criteria;
has_image_not_known_to_sync.cluster_id = 11;
- base::ranges::for_each(
+ std::ranges::for_each(
has_image_not_known_to_sync.visits, [&](auto& cluster_visit) {
cluster_visit.annotated_visit.visit_row.is_known_to_sync = false;
});
@@ -100,7 +100,7 @@
history::Cluster meets_all_criteria_but_not_after_skipped_visits =
meets_all_criteria;
meets_all_criteria_but_not_after_skipped_visits.cluster_id = 12;
- base::ranges::for_each(
+ std::ranges::for_each(
meets_all_criteria_but_not_after_skipped_visits.visits,
[&](auto& cluster_visit) { cluster_visit.score = 0.0; });
@@ -154,7 +154,7 @@
/*engagement_score_provider_is_valid=*/true);
std::vector<history::Cluster> clusters = GetTestClusters();
- base::ranges::for_each(clusters, [&](auto& cluster) {
+ std::ranges::for_each(clusters, [&](auto& cluster) {
cluster.should_show_on_prominent_ui_surfaces = false;
});
cluster_processor->ProcessClusters(&clusters);
diff --git a/components/history_clusters/core/history_clusters_db_tasks.cc b/components/history_clusters/core/history_clusters_db_tasks.cc
index e73b545..cc2ea73 100644
--- a/components/history_clusters/core/history_clusters_db_tasks.cc
+++ b/components/history_clusters/core/history_clusters_db_tasks.cc
@@ -8,7 +8,6 @@
#include "base/containers/contains.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/timer/elapsed_timer.h"
#include "components/history/core/browser/history_backend.h"
@@ -322,10 +321,10 @@
static_cast<size_t>(GetConfig().max_visits_to_cluster))
break;
cluster_ids_.push_back(cluster_id);
- base::ranges::move(backend->ToAnnotatedVisitsFromIds(
- visit_ids_of_cluster,
- /*compute_redirect_chain_start_properties=*/true),
- std::back_inserter(annotated_visits_));
+ std::ranges::move(backend->ToAnnotatedVisitsFromIds(
+ visit_ids_of_cluster,
+ /*compute_redirect_chain_start_properties=*/true),
+ std::back_inserter(annotated_visits_));
}
}
diff --git a/components/history_clusters/core/history_clusters_service.cc b/components/history_clusters/core/history_clusters_service.cc
index 339b1ad..33a3bc4 100644
--- a/components/history_clusters/core/history_clusters_service.cc
+++ b/components/history_clusters/core/history_clusters_service.cc
@@ -14,7 +14,6 @@
#include "base/i18n/case_conversion.h"
#include "base/json/values_util.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/system/sys_info.h"
#include "base/time/time.h"
@@ -461,7 +460,7 @@
continue;
}
const size_t visible_visits =
- base::ranges::count_if(cluster.visits, [](const auto& cluster_visit) {
+ std::ranges::count_if(cluster.visits, [](const auto& cluster_visit) {
// Hidden visits shouldn't contribute to the keyword bag, but Done
// visits still can, since they are searchable.
return cluster_visit.score > 0 &&
diff --git a/components/history_clusters/core/history_clusters_service_task_update_cluster_triggerability.cc b/components/history_clusters/core/history_clusters_service_task_update_cluster_triggerability.cc
index bc12a02..0793dc2 100644
--- a/components/history_clusters/core/history_clusters_service_task_update_cluster_triggerability.cc
+++ b/components/history_clusters/core/history_clusters_service_task_update_cluster_triggerability.cc
@@ -207,12 +207,12 @@
clusters.back().GetMostRecentVisit().annotated_visit.visit_row.visit_time;
std::vector<history::Cluster> filtered_clusters;
- base::ranges::copy_if(std::make_move_iterator(clusters.begin()),
- std::make_move_iterator(clusters.end()),
- std::back_inserter(filtered_clusters),
- [&](const history::Cluster& cluster) {
- return !cluster.triggerability_calculated;
- });
+ std::ranges::copy_if(std::make_move_iterator(clusters.begin()),
+ std::make_move_iterator(clusters.end()),
+ std::back_inserter(filtered_clusters),
+ [&](const history::Cluster& cluster) {
+ return !cluster.triggerability_calculated;
+ });
if (filtered_clusters.empty()) {
if (!updated_cluster_triggerability_after_filtered_clusters_empty_) {
diff --git a/components/history_clusters/core/history_clusters_util.cc b/components/history_clusters/core/history_clusters_util.cc
index 94f746b..69006e9 100644
--- a/components/history_clusters/core/history_clusters_util.cc
+++ b/components/history_clusters/core/history_clusters_util.cc
@@ -12,7 +12,6 @@
#include "base/containers/contains.h"
#include "base/i18n/case_conversion.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/history/core/browser/history_types.h"
@@ -194,7 +193,7 @@
}
void StableSortVisits(std::vector<history::ClusterVisit>& visits) {
- base::ranges::stable_sort(visits, [](auto& v1, auto& v2) {
+ std::ranges::stable_sort(visits, [](auto& v1, auto& v2) {
if (v1.score != v2.score) {
// Use v1 > v2 to get higher scored visits BEFORE lower scored visits.
return v1.score > v2.score;
@@ -248,7 +247,7 @@
}
if (GetConfig().sort_clusters_within_batch_for_query) {
- base::ranges::stable_sort(clusters, [](auto& c1, auto& c2) {
+ std::ranges::stable_sort(clusters, [](auto& c1, auto& c2) {
// Use c1 > c2 to get higher scored clusters BEFORE lower scored clusters.
return c1.search_match_score > c2.search_match_score;
});
@@ -349,7 +348,7 @@
void CoalesceRelatedSearches(std::vector<history::Cluster>& clusters) {
constexpr size_t kMaxRelatedSearches = 5;
- base::ranges::for_each(clusters, [](auto& cluster) {
+ std::ranges::for_each(clusters, [](auto& cluster) {
for (const auto& visit : cluster.visits) {
// Coalesce the unique related searches of this visit into the cluster
// until the cap is reached.
@@ -378,7 +377,7 @@
// After that, sort clusters reverse-chronologically based on their highest
// scored visit.
- base::ranges::stable_sort(*clusters, [&](auto& c1, auto& c2) {
+ std::ranges::stable_sort(*clusters, [&](auto& c1, auto& c2) {
if (c1.visits.empty()) {
return false;
}
diff --git a/components/history_clusters/core/history_clusters_util_unittest.cc b/components/history_clusters/core/history_clusters_util_unittest.cc
index fca0740..ffde05d7 100644
--- a/components/history_clusters/core/history_clusters_util_unittest.cc
+++ b/components/history_clusters/core/history_clusters_util_unittest.cc
@@ -9,7 +9,8 @@
#include "components/history_clusters/core/history_clusters_util.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/stringprintf.h"
#include "base/test/metrics/histogram_tester.h"
#include "components/history/core/browser/history_types.h"
@@ -265,10 +266,10 @@
auto add_cluster = [&](int64_t cluster_id, std::vector<float> visit_scores) {
history::Cluster cluster;
cluster.cluster_id = cluster_id;
- base::ranges::transform(visit_scores, std::back_inserter(cluster.visits),
- [&](const auto& visit_score) {
- return GetHardcodedClusterVisit(1, visit_score);
- });
+ std::ranges::transform(visit_scores, std::back_inserter(cluster.visits),
+ [&](const auto& visit_score) {
+ return GetHardcodedClusterVisit(1, visit_score);
+ });
cluster.keyword_to_data_map = {{u"keyword", history::ClusterKeywordData()}};
all_clusters.push_back(cluster);
};
diff --git a/components/history_clusters/core/query_clusters_state.cc b/components/history_clusters/core/query_clusters_state.cc
index 85999f3..1a75d67 100644
--- a/components/history_clusters/core/query_clusters_state.cc
+++ b/components/history_clusters/core/query_clusters_state.cc
@@ -4,25 +4,25 @@
#include "components/history_clusters/core/query_clusters_state.h"
+#include <algorithm>
#include <set>
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
#include "components/history/core/browser/history_service.h"
#include "components/history/core/browser/history_types.h"
-#include "components/strings/grit/components_strings.h"
#include "components/history_clusters/core/features.h"
#include "components/history_clusters/core/history_clusters_service.h"
#include "components/history_clusters/core/history_clusters_service_task.h"
#include "components/history_clusters/core/history_clusters_util.h"
-#include "url/gurl.h"
+#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
+#include "url/gurl.h"
namespace history_clusters {
@@ -311,8 +311,8 @@
// Warning: N^2 algorithm below. If this ends up scaling poorly, it can be
// optimized by adding a map that tracks which labels have been seen
// already.
- auto it = base::ranges::find(raw_label_counts_so_far_, raw_label_value,
- &LabelCount::first);
+ auto it = std::ranges::find(raw_label_counts_so_far_, raw_label_value,
+ &LabelCount::first);
if (it == raw_label_counts_so_far_.end()) {
it = raw_label_counts_so_far_.insert(it,
std::make_pair(raw_label_value, 0));
diff --git a/components/history_clusters/core/similar_visit_deduper_cluster_finalizer.cc b/components/history_clusters/core/similar_visit_deduper_cluster_finalizer.cc
index 1a19128..4592e9a 100644
--- a/components/history_clusters/core/similar_visit_deduper_cluster_finalizer.cc
+++ b/components/history_clusters/core/similar_visit_deduper_cluster_finalizer.cc
@@ -4,10 +4,10 @@
#include "components/history_clusters/core/similar_visit_deduper_cluster_finalizer.h"
+#include <algorithm>
#include <unordered_map>
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "components/history/core/browser/history_types.h"
#include "components/history_clusters/core/on_device_clustering_util.h"
#include "components/history_clusters/core/similar_visit.h"
diff --git a/components/history_embeddings/ml_answerer.cc b/components/history_embeddings/ml_answerer.cc
index a9be764..e0c5fea4 100644
--- a/components/history_embeddings/ml_answerer.cc
+++ b/components/history_embeddings/ml_answerer.cc
@@ -4,9 +4,10 @@
#include "components/history_embeddings/ml_answerer.h"
+#include <algorithm>
+
#include "base/barrier_callback.h"
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "components/history_embeddings/history_embeddings_features.h"
#include "components/optimization_guide/core/optimization_guide_model_executor.h"
@@ -152,7 +153,7 @@
// Sort the inputs according to their indices in the original vector, so
// we prioritize passages that are more relevant.
- base::ranges::sort(
+ std::ranges::sort(
inputs.begin(), inputs.end(),
[](ModelInput& i1, ModelInput& i2) { return i1.index < i2.index; });
diff --git a/components/history_embeddings/vector_database.cc b/components/history_embeddings/vector_database.cc
index b02b14a..0092728 100644
--- a/components/history_embeddings/vector_database.cc
+++ b/components/history_embeddings/vector_database.cc
@@ -4,9 +4,9 @@
#include "components/history_embeddings/vector_database.h"
+#include <algorithm>
#include <queue>
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
@@ -398,8 +398,8 @@
search_info.word_match_scored_urls.push_back(top_by_word_match_score.top());
top_by_word_match_score.pop();
}
- base::ranges::reverse(search_info.scored_urls);
- base::ranges::reverse(search_info.word_match_scored_urls);
+ std::ranges::reverse(search_info.scored_urls);
+ std::ranges::reverse(search_info.word_match_scored_urls);
return search_info;
}
diff --git a/components/infobars/core/infobar_container.cc b/components/infobars/core/infobar_container.cc
index 5db1954..fe20d04 100644
--- a/components/infobars/core/infobar_container.cc
+++ b/components/infobars/core/infobar_container.cc
@@ -4,13 +4,14 @@
#include "components/infobars/core/infobar_container.h"
+#include <algorithm>
+
#include "base/auto_reset.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/metrics_hashes.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/infobars/core/infobar.h"
#include "components/infobars/core/infobar_delegate.h"
@@ -82,7 +83,7 @@
void InfoBarContainer::RemoveInfoBar(InfoBar* infobar) {
infobar->set_container(nullptr);
- auto i = base::ranges::find(infobars_, infobar);
+ auto i = std::ranges::find(infobars_, infobar);
CHECK(i != infobars_.end());
PlatformSpecificRemoveInfoBar(infobar);
infobars_.erase(i);
@@ -110,7 +111,7 @@
void InfoBarContainer::OnInfoBarReplaced(InfoBar* old_infobar,
InfoBar* new_infobar) {
PlatformSpecificReplaceInfoBar(old_infobar, new_infobar);
- InfoBars::const_iterator i = base::ranges::find(infobars_, old_infobar);
+ InfoBars::const_iterator i = std::ranges::find(infobars_, old_infobar);
CHECK(i != infobars_.end());
size_t position = i - infobars_.begin();
old_infobar->Hide(false);
diff --git a/components/infobars/core/infobar_manager.cc b/components/infobars/core/infobar_manager.cc
index 82f6f5ea..6c7e9083 100644
--- a/components/infobars/core/infobar_manager.cc
+++ b/components/infobars/core/infobar_manager.cc
@@ -4,11 +4,11 @@
#include "components/infobars/core/infobar_manager.h"
+#include <algorithm>
#include <utility>
#include "base/command_line.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "build/branding_buildflags.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
#include "components/infobars/core/infobar.h"
@@ -95,7 +95,7 @@
return nullptr;
}
- auto i = base::ranges::find(infobars_, old_infobar);
+ auto i = std::ranges::find(infobars_, old_infobar);
CHECK(i != infobars_.end());
InfoBar* new_infobar_ptr = new_infobar.release();
@@ -151,7 +151,7 @@
void InfoBarManager::RemoveInfoBarInternal(InfoBar* infobar, bool animate) {
DCHECK(infobar);
- auto i = base::ranges::find(infobars_, infobar);
+ auto i = std::ranges::find(infobars_, infobar);
// TODO(crbug.com/): Temporarily a CHECK instead of a DCHECK CHECK() in order
// to help diagnose suspected memory smashing caused by invalid call of this
// method happening in production code on iOS.
diff --git a/components/input/cursor_manager.cc b/components/input/cursor_manager.cc
index 910b094..d39fce1 100644
--- a/components/input/cursor_manager.cc
+++ b/components/input/cursor_manager.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "components/input/render_widget_host_view_input.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"
@@ -92,7 +91,7 @@
return true;
}
- const int max_dimension_dips = base::ranges::min(dimension_restrictions_);
+ const int max_dimension_dips = std::ranges::min(dimension_restrictions_);
const gfx::Size size_in_dip = gfx::ScaleToCeiledSize(
gfx::SkISizeToSize(cursor.custom_bitmap().dimensions()),
1 / cursor.image_scale_factor());
@@ -105,7 +104,7 @@
const ui::Cursor& target_cursor = cursor_map_[view_under_cursor_];
const bool cursor_allowed_before = IsCursorAllowed(target_cursor);
- auto it = base::ranges::find(dimension_restrictions_, max_dimension_dips);
+ auto it = std::ranges::find(dimension_restrictions_, max_dimension_dips);
CHECK(it != dimension_restrictions_.end());
dimension_restrictions_.erase(it);
diff --git a/components/js_injection/common/origin_matcher_internal.cc b/components/js_injection/common/origin_matcher_internal.cc
index 1a9fd5f..cf8c192 100644
--- a/components/js_injection/common/origin_matcher_internal.cc
+++ b/components/js_injection/common/origin_matcher_internal.cc
@@ -4,7 +4,8 @@
#include "components/js_injection/common/origin_matcher_internal.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -18,7 +19,7 @@
// Returns false if |host| has too many wildcards.
inline bool HostWildcardSanityCheck(const std::string& host) {
- size_t wildcard_count = base::ranges::count(host, '*');
+ size_t wildcard_count = std::ranges::count(host, '*');
if (wildcard_count == 0)
return true;
diff --git a/components/js_injection/renderer/js_binding.cc b/components/js_injection/renderer/js_binding.cc
index 587d2bd..dbda579e 100644
--- a/components/js_injection/renderer/js_binding.cc
+++ b/components/js_injection/renderer/js_binding.cc
@@ -9,6 +9,7 @@
#include "components/js_injection/renderer/js_binding.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <vector>
@@ -16,7 +17,6 @@
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/functional/overloaded.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "components/js_injection/common/interfaces.mojom-forward.h"
#include "components/js_injection/renderer/js_communication.h"
diff --git a/components/keyed_service/core/dependency_graph.cc b/components/keyed_service/core/dependency_graph.cc
index aaf3568..1fa2556c 100644
--- a/components/keyed_service/core/dependency_graph.cc
+++ b/components/keyed_service/core/dependency_graph.cc
@@ -14,7 +14,6 @@
#include "base/containers/circular_deque.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
namespace {
@@ -110,7 +109,7 @@
it++;
edges.erase(temp);
- bool has_incoming_edges = base::ranges::any_of(
+ bool has_incoming_edges = std::ranges::any_of(
edges, [dest](const auto& edge) { return edge.second == dest; });
if (!has_incoming_edges)
diff --git a/components/language/content/browser/geo_language_model.cc b/components/language/content/browser/geo_language_model.cc
index d3064c4..f1d8e59 100644
--- a/components/language/content/browser/geo_language_model.cc
+++ b/components/language/content/browser/geo_language_model.cc
@@ -4,9 +4,9 @@
#include "components/language/content/browser/geo_language_model.h"
+#include <algorithm>
#include <functional>
-#include "base/ranges/algorithm.h"
#include "components/language/content/browser/geo_language_provider.h"
namespace language {
@@ -22,11 +22,11 @@
geo_language_provider_->CurrentGeoLanguages();
std::vector<LanguageDetails> languages(geo_inferred_languages.size());
- base::ranges::transform(geo_inferred_languages, languages.begin(),
- [](const std::string& language) {
- return LanguageModel::LanguageDetails(language,
- 0.0f);
- });
+ std::ranges::transform(geo_inferred_languages, languages.begin(),
+ [](const std::string& language) {
+ return LanguageModel::LanguageDetails(language,
+ 0.0f);
+ });
return languages;
}
diff --git a/components/language/core/browser/ulp_metrics_logger.cc b/components/language/core/browser/ulp_metrics_logger.cc
index b32ed6b..55f4c120 100644
--- a/components/language/core/browser/ulp_metrics_logger.cc
+++ b/components/language/core/browser/ulp_metrics_logger.cc
@@ -4,10 +4,11 @@
#include "components/language/core/browser/ulp_metrics_logger.h"
+#include <algorithm>
+
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/metrics_hashes.h"
-#include "base/ranges/algorithm.h"
#include "ui/base/l10n/l10n_util.h"
namespace language {
@@ -77,7 +78,7 @@
// Search for exact match of language in ulp_languages (e.g. pt-BR != pt-MZ).
std::vector<std::string>::const_iterator exact_match =
- base::ranges::find(ulp_languages, language);
+ std::ranges::find(ulp_languages, language);
if (exact_match == ulp_languages.begin()) {
return ULPLanguageStatus::kTopULPLanguageExactMatch;
} else if (exact_match != ulp_languages.end()) {
@@ -86,7 +87,7 @@
// Now search for a base language match (e.g pt-BR == pt-MZ).
const std::string base_language = l10n_util::GetLanguage(language);
- std::vector<std::string>::const_iterator base_match = base::ranges::find_if(
+ std::vector<std::string>::const_iterator base_match = std::ranges::find_if(
ulp_languages, [&base_language](const std::string& ulp_language) {
return base_language.compare(l10n_util::GetLanguage(ulp_language)) == 0;
});
@@ -109,7 +110,7 @@
for (const std::string& language : languages) {
// Search for base matches of language (e.g. pt-BR == pt-MZ).
const std::string base_language = l10n_util::GetLanguage(language);
- if (base::ranges::any_of(
+ if (std::ranges::any_of(
compare_languages,
[&base_language](const std::string& compare_language) {
return base_language.compare(
@@ -129,7 +130,7 @@
for (const auto& language : languages) {
// Only add languages that do not have a base match in ulp_languages.
const std::string base_language = l10n_util::GetLanguage(language);
- if (base::ranges::none_of(
+ if (std::ranges::none_of(
ulp_languages, [&base_language](const std::string& ulp_language) {
return base_language.compare(
l10n_util::GetLanguage(ulp_language)) == 0;
diff --git a/components/language/core/common/locale_util.cc b/components/language/core/common/locale_util.cc
index 8e80ed1..01e7d92 100644
--- a/components/language/core/common/locale_util.cc
+++ b/components/language/core/common/locale_util.cc
@@ -6,9 +6,9 @@
#include <stddef.h>
+#include <algorithm>
#include <string_view>
-#include "base/ranges/algorithm.h"
#include "ui/base/l10n/l10n_util.h"
namespace language {
@@ -16,7 +16,7 @@
std::pair<std::string_view, std::string_view> SplitIntoMainAndTail(
std::string_view locale) {
size_t hyphen_pos =
- static_cast<size_t>(base::ranges::find(locale, '-') - locale.begin());
+ static_cast<size_t>(std::ranges::find(locale, '-') - locale.begin());
return std::make_pair(locale.substr(0U, hyphen_pos),
locale.substr(hyphen_pos));
}
diff --git a/components/lookalikes/core/safety_tips_config.cc b/components/lookalikes/core/safety_tips_config.cc
index d315d45..181b048 100644
--- a/components/lookalikes/core/safety_tips_config.cc
+++ b/components/lookalikes/core/safety_tips_config.cc
@@ -4,8 +4,9 @@
#include "components/lookalikes/core/safety_tips_config.h"
+#include <algorithm>
+
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
#include "third_party/re2/src/re2/re2.h"
#include "url/gurl.h"
@@ -187,7 +188,7 @@
}
auto common_words = proto->common_word();
- DCHECK(base::ranges::is_sorted(common_words.begin(), common_words.end()));
+ DCHECK(std::ranges::is_sorted(common_words.begin(), common_words.end()));
auto lower = std::lower_bound(
common_words.begin(), common_words.end(), word,
[](const std::string& a, const std::string& b) -> bool { return a < b; });
diff --git a/components/media_effects/media_device_info.cc b/components/media_effects/media_device_info.cc
index 3160a6a..add6fe9 100644
--- a/components/media_effects/media_device_info.cc
+++ b/components/media_effects/media_device_info.cc
@@ -112,8 +112,8 @@
}
auto device_iter =
- base::ranges::find(audio_device_infos_.value(), device_id,
- &media::AudioDeviceDescription::unique_id);
+ std::ranges::find(audio_device_infos_.value(), device_id,
+ &media::AudioDeviceDescription::unique_id);
if (device_iter != audio_device_infos_->end()) {
return *device_iter;
}
@@ -128,10 +128,10 @@
}
auto device_iter =
- base::ranges::find(video_device_infos_.value(), device_id,
- [](const media::VideoCaptureDeviceInfo& device) {
- return device.descriptor.device_id;
- });
+ std::ranges::find(video_device_infos_.value(), device_id,
+ [](const media::VideoCaptureDeviceInfo& device) {
+ return device.descriptor.device_id;
+ });
if (device_iter != video_device_infos_->end()) {
return *device_iter;
}
diff --git a/components/media_message_center/media_notification_view_impl_unittest.cc b/components/media_message_center/media_notification_view_impl_unittest.cc
index b2d5628..f387f6a 100644
--- a/components/media_message_center/media_notification_view_impl_unittest.cc
+++ b/components/media_message_center/media_notification_view_impl_unittest.cc
@@ -4,13 +4,13 @@
#include "components/media_message_center/media_notification_view_impl.h"
+#include <algorithm>
#include <memory>
#include "base/containers/flat_set.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/mock_callback.h"
@@ -182,7 +182,7 @@
views::Button* GetButtonForAction(MediaSessionAction action) const {
auto buttons = view()->get_buttons_for_testing();
- const auto i = base::ranges::find(
+ const auto i = std::ranges::find(
buttons, static_cast<int>(action),
[](const views::View* v) { return views::Button::AsButton(v)->tag(); });
return (i == buttons.end()) ? nullptr : views::Button::AsButton(*i);
diff --git a/components/media_router/browser/presentation/controller_presentation_service_delegate_impl.cc b/components/media_router/browser/presentation/controller_presentation_service_delegate_impl.cc
index 471c33e0..d670667 100644
--- a/components/media_router/browser/presentation/controller_presentation_service_delegate_impl.cc
+++ b/components/media_router/browser/presentation/controller_presentation_service_delegate_impl.cc
@@ -4,6 +4,7 @@
#include "components/media_router/browser/presentation/controller_presentation_service_delegate_impl.h"
+#include <algorithm>
#include <map>
#include <memory>
#include <string>
@@ -17,7 +18,6 @@
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -484,7 +484,7 @@
PresentationErrorType::UNKNOWN, "Invalid presentation arguments."));
return;
}
- if (!base::ranges::all_of(presentation_urls, IsValidPresentationUrl)) {
+ if (!std::ranges::all_of(presentation_urls, IsValidPresentationUrl)) {
std::move(error_cb).Run(
PresentationError(PresentationErrorType::NO_PRESENTATION_FOUND,
"Invalid presentation URL."));
diff --git a/components/media_router/common/media_source.cc b/components/media_router/common/media_source.cc
index c2a68a9..0570b91 100644
--- a/components/media_router/common/media_source.cc
+++ b/components/media_router/common/media_source.cc
@@ -4,13 +4,13 @@
#include "components/media_router/common/media_source.h"
+#include <algorithm>
#include <array>
#include <cstdio>
#include <ostream>
#include <string>
#include <string_view>
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
@@ -48,9 +48,9 @@
bool IsSchemeAllowed(const GURL& url) {
return url.SchemeIsHTTPOrHTTPS() ||
- base::ranges::any_of(
- kAllowedSchemes,
- [&url](const char* const scheme) { return url.SchemeIs(scheme); });
+ std::ranges::any_of(kAllowedSchemes, [&url](const char* const scheme) {
+ return url.SchemeIs(scheme);
+ });
}
bool IsSystemAudioCaptureSupported() {
diff --git a/components/media_router/common/providers/cast/cast_media_source.cc b/components/media_router/common/providers/cast/cast_media_source.cc
index 614956b..7555065 100644
--- a/components/media_router/common/providers/cast/cast_media_source.cc
+++ b/components/media_router/common/providers/cast/cast_media_source.cc
@@ -4,12 +4,12 @@
#include "components/media_router/common/providers/cast/cast_media_source.h"
+#include <algorithm>
#include <string_view>
#include <utility>
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
@@ -483,7 +483,7 @@
bool CastMediaSource::ContainsAnyAppFrom(
const std::vector<std::string>& app_ids) const {
- return base::ranges::any_of(app_ids, [this](const std::string& app_id) {
+ return std::ranges::any_of(app_ids, [this](const std::string& app_id) {
return ContainsApp(app_id);
});
}
diff --git a/components/media_router/common/providers/cast/channel/cast_message_handler.cc b/components/media_router/common/providers/cast/channel/cast_message_handler.cc
index 7984f07..bb58dd0 100644
--- a/components/media_router/common/providers/cast/channel/cast_message_handler.cc
+++ b/components/media_router/common/providers/cast/channel/cast_message_handler.cc
@@ -4,6 +4,7 @@
#include "components/media_router/common/providers/cast/channel/cast_message_handler.h"
+#include <algorithm>
#include <string>
#include <tuple>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/not_fatal_until.h"
#include "base/observer_list.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/time/default_tick_clock.h"
#include "base/types/expected_macros.h"
@@ -576,8 +576,8 @@
const base::Value::Dict& response) {
// Look up an app availability request by its |request_id|.
auto app_availability_it =
- base::ranges::find(pending_app_availability_requests_, request_id,
- &GetAppAvailabilityRequest::request_id);
+ std::ranges::find(pending_app_availability_requests_, request_id,
+ &GetAppAvailabilityRequest::request_id);
// If we found a request, process and remove all requests with the same
// |app_id|, which will of course include the one we just found.
if (app_availability_it != pending_app_availability_requests_.end()) {
@@ -631,8 +631,8 @@
int request_id) {
DVLOG(1) << __func__ << ", request_id: " << request_id;
- auto it = base::ranges::find(pending_app_availability_requests_, request_id,
- &GetAppAvailabilityRequest::request_id);
+ auto it = std::ranges::find(pending_app_availability_requests_, request_id,
+ &GetAppAvailabilityRequest::request_id);
CHECK(it != pending_app_availability_requests_.end());
std::move((*it)->callback)
diff --git a/components/media_router/common/providers/cast/channel/cast_socket_service.cc b/components/media_router/common/providers/cast/channel/cast_socket_service.cc
index e213040..76188e1f 100644
--- a/components/media_router/common/providers/cast/channel/cast_socket_service.cc
+++ b/components/media_router/common/providers/cast/channel/cast_socket_service.cc
@@ -4,10 +4,11 @@
#include "components/media_router/common/providers/cast/channel/cast_socket_service.h"
+#include <algorithm>
+
#include "base/memory/ptr_util.h"
#include "base/numerics/checked_math.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "components/media_router/common/providers/cast/channel/cast_socket.h"
#include "components/media_router/common/providers/cast/channel/logger.h"
#include "content/public/browser/browser_task_traits.h"
@@ -87,10 +88,10 @@
CastSocket* CastSocketServiceImpl::GetSocket(
const net::IPEndPoint& ip_endpoint) const {
DCHECK(task_runner_->BelongsToCurrentThread());
- auto it = base::ranges::find(sockets_, ip_endpoint,
- [](const Sockets::value_type& pair) {
- return pair.second->ip_endpoint();
- });
+ auto it = std::ranges::find(sockets_, ip_endpoint,
+ [](const Sockets::value_type& pair) {
+ return pair.second->ip_endpoint();
+ });
return it == sockets_.end() ? nullptr : it->second.get();
}
diff --git a/components/metrics/call_stacks/call_stack_profile_metadata.cc b/components/metrics/call_stacks/call_stack_profile_metadata.cc
index c85d7bc..03b48fa 100644
--- a/components/metrics/call_stacks/call_stack_profile_metadata.cc
+++ b/components/metrics/call_stacks/call_stack_profile_metadata.cc
@@ -4,11 +4,10 @@
#include "components/metrics/call_stacks/call_stack_profile_metadata.h"
+#include <algorithm>
#include <iterator>
#include <tuple>
-#include "base/ranges/algorithm.h"
-
namespace metrics {
namespace {
@@ -46,7 +45,7 @@
const auto rbegin = std::make_reverse_iterator(end);
const auto rend = std::make_reverse_iterator(begin);
for (auto it = rbegin; it != rend; ++it) {
- auto item = base::ranges::find_if(
+ auto item = std::ranges::find_if(
it->metadata(), MatchesNameHashIndexAndKey(name_hash_index, key));
if (item == it->metadata().end()) {
diff --git a/components/metrics/call_stacks/call_stack_profile_metadata_unittest.cc b/components/metrics/call_stacks/call_stack_profile_metadata_unittest.cc
index 9027613..3cb83c19 100644
--- a/components/metrics/call_stacks/call_stack_profile_metadata_unittest.cc
+++ b/components/metrics/call_stacks/call_stack_profile_metadata_unittest.cc
@@ -4,10 +4,10 @@
#include "components/metrics/call_stacks/call_stack_profile_metadata.h"
+#include <algorithm>
#include <tuple>
#include <utility>
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -31,7 +31,7 @@
base::StrCat({"at sample_index ", base::NumberToString(sample_index),
", metadata_index ", base::NumberToString(metadata_index)});
const int name_hash_index =
- base::ranges::find(name_hashes, expected_item.name_hash) -
+ std::ranges::find(name_hashes, expected_item.name_hash) -
name_hashes.begin();
ASSERT_NE(name_hash_index, name_hashes.size()) << index_info;
@@ -61,7 +61,7 @@
base::StrCat({"at sample_index ", base::NumberToString(sample_index),
", metadata_index ", base::NumberToString(metadata_index)});
const int name_hash_index =
- base::ranges::find(name_hashes, expected_item.name_hash) -
+ std::ranges::find(name_hashes, expected_item.name_hash) -
name_hashes.begin();
ASSERT_NE(name_hash_index, name_hashes.size()) << index_info;
diff --git a/components/metrics/call_stacks/call_stack_profile_metrics_provider.cc b/components/metrics/call_stacks/call_stack_profile_metrics_provider.cc
index 03c5534..8c81632f 100644
--- a/components/metrics/call_stacks/call_stack_profile_metrics_provider.cc
+++ b/components/metrics/call_stacks/call_stack_profile_metrics_provider.cc
@@ -4,6 +4,7 @@
#include "components/metrics/call_stacks/call_stack_profile_metrics_provider.h"
+#include <algorithm>
#include <utility>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/synchronization/lock.h"
#include "base/thread_annotations.h"
#include "base/time/time.h"
@@ -329,10 +329,9 @@
// stack has at least 2 frames. (The current instruction pointer should always
// count as one, so two means we had some luck walking the stack.)
const auto& stacks = profile.call_stack_profile().stack();
- return base::ranges::find_if(stacks,
- [](const CallStackProfile::Stack& stack) {
- return stack.frame_size() >= 2;
- }) != stacks.end();
+ return std::ranges::find_if(stacks, [](const CallStackProfile::Stack& stack) {
+ return stack.frame_size() >= 2;
+ }) != stacks.end();
}
void ReceivedProfileCounter::OnRetrieveProfiles(
diff --git a/components/mirroring/service/fake_network_service.cc b/components/mirroring/service/fake_network_service.cc
index b9e1781..ee9ca48 100644
--- a/components/mirroring/service/fake_network_service.cc
+++ b/components/mirroring/service/fake_network_service.cc
@@ -9,9 +9,8 @@
#include "components/mirroring/service/fake_network_service.h"
+#include <algorithm>
#include <memory>
-
-#include "base/ranges/algorithm.h"
// #include "media/cast/test/utility/net_utility.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "net/base/ip_address.h"
@@ -90,7 +89,7 @@
}
void MockUdpSocket::VerifySendingPacket(const media::cast::Packet& packet) {
- EXPECT_TRUE(base::ranges::equal(packet, *sending_packet_));
+ EXPECT_TRUE(std::ranges::equal(packet, *sending_packet_));
}
MockNetworkContext::MockNetworkContext(
diff --git a/components/no_state_prefetch/browser/no_state_prefetch_link_manager.cc b/components/no_state_prefetch/browser/no_state_prefetch_link_manager.cc
index 310b97cb..ad03225 100644
--- a/components/no_state_prefetch/browser/no_state_prefetch_link_manager.cc
+++ b/components/no_state_prefetch/browser/no_state_prefetch_link_manager.cc
@@ -4,6 +4,7 @@
#include "components/no_state_prefetch/browser/no_state_prefetch_link_manager.h"
+#include <algorithm>
#include <functional>
#include <limits>
#include <memory>
@@ -13,7 +14,6 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/no_state_prefetch/browser/no_state_prefetch_contents.h"
#include "components/no_state_prefetch/browser/no_state_prefetch_handle.h"
@@ -180,7 +180,7 @@
}
size_t NoStatePrefetchLinkManager::CountRunningTriggers() const {
- return base::ranges::count_if(
+ return std::ranges::count_if(
triggers_, [](const std::unique_ptr<LinkTrigger>& trigger) {
return trigger->handle && trigger->handle->IsPrefetching();
});
diff --git a/components/no_state_prefetch/browser/no_state_prefetch_manager.cc b/components/no_state_prefetch/browser/no_state_prefetch_manager.cc
index 895416d..0e02527d 100644
--- a/components/no_state_prefetch/browser/no_state_prefetch_manager.cc
+++ b/components/no_state_prefetch/browser/no_state_prefetch_manager.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <functional>
#include <optional>
#include <string>
@@ -25,7 +26,6 @@
#include "base/metrics/field_trial.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/system/sys_info.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/components/ntp_tiles/custom_links_manager_impl.cc b/components/ntp_tiles/custom_links_manager_impl.cc
index 703f1af..4ba4ec5b 100644
--- a/components/ntp_tiles/custom_links_manager_impl.cc
+++ b/components/ntp_tiles/custom_links_manager_impl.cc
@@ -4,6 +4,7 @@
#include "components/ntp_tiles/custom_links_manager_impl.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/auto_reset.h"
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "components/ntp_tiles/constants.h"
#include "components/ntp_tiles/deleted_tile_type.h"
#include "components/ntp_tiles/metrics.h"
@@ -225,7 +225,7 @@
std::vector<CustomLinksManager::Link>::iterator
CustomLinksManagerImpl::FindLinkWithUrl(const GURL& url) {
- return base::ranges::find(current_links_, url, &Link::url);
+ return std::ranges::find(current_links_, url, &Link::url);
}
base::CallbackListSubscription
diff --git a/components/offline_items_collection/core/offline_content_aggregator.cc b/components/offline_items_collection/core/offline_content_aggregator.cc
index 4f3abee..68ada31 100644
--- a/components/offline_items_collection/core/offline_content_aggregator.cc
+++ b/components/offline_items_collection/core/offline_content_aggregator.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/offline_items_collection/core/offline_content_aggregator.h"
+
+#include <algorithm>
#include <string>
#include <utility>
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
-#include "components/offline_items_collection/core/offline_content_aggregator.h"
#include "components/offline_items_collection/core/offline_item.h"
namespace offline_items_collection {
@@ -243,7 +244,7 @@
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (!pending_providers_.empty()) {
- auto item = base::ranges::find(aggregated_items_, id, &OfflineItem::id);
+ auto item = std::ranges::find(aggregated_items_, id, &OfflineItem::id);
if (item != aggregated_items_.end())
aggregated_items_.erase(item);
}
diff --git a/components/offline_pages/core/background/request_coordinator.cc b/components/offline_pages/core/background/request_coordinator.cc
index 2aa96bf1..e4d07d2 100644
--- a/components/offline_pages/core/background/request_coordinator.cc
+++ b/components/offline_pages/core/background/request_coordinator.cc
@@ -4,6 +4,7 @@
#include "components/offline_pages/core/background/request_coordinator.h"
+#include <algorithm>
#include <limits>
#include <memory>
#include <utility>
@@ -16,7 +17,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/system/sys_info.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -362,7 +362,7 @@
const std::vector<int64_t>& request_ids) {
// Remove the paused requests from prioritized list.
for (int64_t id : request_ids) {
- auto it = base::ranges::find(prioritized_requests_, id);
+ auto it = std::ranges::find(prioritized_requests_, id);
if (it != prioritized_requests_.end())
prioritized_requests_.erase(it);
}
diff --git a/components/omnibox/browser/actions/history_clusters_action.cc b/components/omnibox/browser/actions/history_clusters_action.cc
index 831efc1..8ec404a 100644
--- a/components/omnibox/browser/actions/history_clusters_action.cc
+++ b/components/omnibox/browser/actions/history_clusters_action.cc
@@ -4,6 +4,7 @@
#include "components/omnibox/browser/actions/history_clusters_action.h"
+#include <algorithm>
#include <string>
#include <string_view>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/memory/scoped_refptr.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
@@ -66,14 +66,14 @@
if (matches_begin == matches_end)
return 0;
std::vector<int> relevances(matches_end - matches_begin);
- base::ranges::transform(
+ std::ranges::transform(
matches_begin, matches_end, relevances.begin(), [&](const auto& match) {
return AutocompleteMatch::IsSearchType(match.type) ==
(filter == TopRelevanceFilter::FILTER_FOR_SEARCH_MATCHES)
? match.relevance
: 0;
});
- return base::ranges::max(relevances);
+ return std::ranges::max(relevances);
}
bool IsNavigationIntent(int top_search_relevance,
@@ -167,7 +167,7 @@
// If there's any action in `result`, don't add a history cluster action to
// avoid over-crowding.
if (!GetConfig().omnibox_action_with_pedals &&
- base::ranges::any_of(
+ std::ranges::any_of(
result, [](const auto& match) { return !match.actions.empty(); })) {
return;
}
diff --git a/components/omnibox/browser/actions/history_clusters_action_unittest.cc b/components/omnibox/browser/actions/history_clusters_action_unittest.cc
index e2c34146..c51993d 100644
--- a/components/omnibox/browser/actions/history_clusters_action_unittest.cc
+++ b/components/omnibox/browser/actions/history_clusters_action_unittest.cc
@@ -4,11 +4,11 @@
#include "components/omnibox/browser/actions/history_clusters_action.h"
+#include <algorithm>
#include <memory>
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/test/task_environment.h"
#include "components/history/core/browser/history_service.h"
#include "components/history/core/test/history_service_test_util.h"
@@ -40,7 +40,7 @@
ACMatches CreateACMatches(std::vector<MatchData> matches_data) {
ACMatches matches;
matches.reserve(matches_data.size());
- base::ranges::transform(
+ std::ranges::transform(
matches_data, std::back_inserter(matches), [](const auto& match_data) {
AutocompleteMatch match(nullptr, match_data.relevance, true,
match_data.type);
diff --git a/components/omnibox/browser/actions/omnibox_pedal.cc b/components/omnibox/browser/actions/omnibox_pedal.cc
index 73adb9e..ad1afd5 100644
--- a/components/omnibox/browser/actions/omnibox_pedal.cc
+++ b/components/omnibox/browser/actions/omnibox_pedal.cc
@@ -4,11 +4,11 @@
#include "components/omnibox/browser/actions/omnibox_pedal.h"
+#include <algorithm>
#include <functional>
#include <numeric>
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "build/build_config.h"
@@ -220,7 +220,7 @@
}
bool OmniboxPedal::SynonymGroup::IsValid() const {
- return base::ranges::all_of(
+ return std::ranges::all_of(
synonyms_, [](const auto& synonym) { return synonym.Size() > 0; });
}
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index f6487b7..a58d50c 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -30,7 +30,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -287,7 +286,7 @@
match.relevance);
};
- auto top_match = base::ranges::max_element(result, {}, get_sort_key);
+ auto top_match = std::ranges::max_element(result, {}, get_sort_key);
return top_match->rich_autocompletion_triggered;
}
@@ -886,7 +885,7 @@
if (done_state == ProviderDoneState::kAllDone) {
size_t calculator_count =
- base::ranges::count_if(published_result_, [](const auto& match) {
+ std::ranges::count_if(published_result_, [](const auto& match) {
return match.type == AutocompleteMatchType::CALCULATOR;
});
UMA_HISTOGRAM_COUNTS_100("Omnibox.NumCalculatorMatches", calculator_count);
@@ -2069,7 +2068,7 @@
// would be scored independently with their partial signals.
internal_result_.DeduplicateMatches(input_, template_url_service_);
- size_t eligible_matches_count = base::ranges::count_if(
+ size_t eligible_matches_count = std::ranges::count_if(
internal_result_.matches_,
[](const auto& match) { return match.IsMlScoringEligible(); });
@@ -2268,7 +2267,7 @@
}
scores_pool.push_back(match.relevance);
}
- base::ranges::sort(scores_pool, std::greater<>());
+ std::ranges::sort(scores_pool, std::greater<>());
// Avoid duplicate scores by ensuring that no two URL suggestions are assigned
// the same score.
@@ -2284,8 +2283,8 @@
prediction_and_position_heap.push_back(
{prediction.value_or(0), scored_positions[i]});
}
- base::ranges::stable_sort(prediction_and_position_heap, std::greater<>(),
- [](const auto& pair) { return pair.first; });
+ std::ranges::stable_sort(prediction_and_position_heap, std::greater<>(),
+ [](const auto& pair) { return pair.first; });
// Assign the finalized relevance scores to each URL suggestion in order of
// priority (i.e. ML score).
@@ -2431,7 +2430,7 @@
}
scores_pool.push_back(match.relevance);
}
- base::ranges::sort(scores_pool, std::greater<>());
+ std::ranges::sort(scores_pool, std::greater<>());
// Avoid duplicate scores by ensuring that no two URL suggestions are assigned
// the same score.
@@ -2447,8 +2446,8 @@
prediction_and_position_heap.push_back(
{prediction.value_or(0), scored_positions[i]});
}
- base::ranges::stable_sort(prediction_and_position_heap, std::greater<>(),
- [](const auto& pair) { return pair.first; });
+ std::ranges::stable_sort(prediction_and_position_heap, std::greater<>(),
+ [](const auto& pair) { return pair.first; });
// Assign the finalized relevance scores to each URL suggestion in order of
// priority (i.e. ML score).
@@ -2474,7 +2473,7 @@
history_domain = GetDomain(*result->match_at(0));
}
- auto iter = base::ranges::find_if(result->matches_, [](const auto& match) {
+ auto iter = std::ranges::find_if(result->matches_, [](const auto& match) {
return match.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY;
});
if (iter == result->matches_.end()) {
diff --git a/components/omnibox/browser/autocomplete_controller_metrics_unittest.cc b/components/omnibox/browser/autocomplete_controller_metrics_unittest.cc
index 34c4ac4..70cdb4e 100644
--- a/components/omnibox/browser/autocomplete_controller_metrics_unittest.cc
+++ b/components/omnibox/browser/autocomplete_controller_metrics_unittest.cc
@@ -4,13 +4,13 @@
#include "components/omnibox/browser/autocomplete_controller_metrics.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include <string>
#include <vector>
#include "base/memory/raw_ref.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
@@ -516,7 +516,7 @@
TEST_F(AutocompleteControllerMetricsTest, MatchStability) {
auto create_result = [&](std::vector<int> ids) {
std::vector<AutocompleteMatch> matches;
- base::ranges::transform(ids, std::back_inserter(matches), [&](int id) {
+ std::ranges::transform(ids, std::back_inserter(matches), [&](int id) {
auto match = CreateMatch(id);
match.relevance -= id;
return match;
diff --git a/components/omnibox/browser/autocomplete_grouper_groups.cc b/components/omnibox/browser/autocomplete_grouper_groups.cc
index 0f82fd2..c7d84ca9 100644
--- a/components/omnibox/browser/autocomplete_grouper_groups.cc
+++ b/components/omnibox/browser/autocomplete_grouper_groups.cc
@@ -45,6 +45,6 @@
}
void Group::GroupMatchesBySearchVsUrl() {
- base::ranges::stable_sort(matches_.begin(), matches_.end(), {},
- [](const auto& m) { return m->GetSortingOrder(); });
+ std::ranges::stable_sort(matches_.begin(), matches_.end(), {},
+ [](const auto& m) { return m->GetSortingOrder(); });
}
diff --git a/components/omnibox/browser/autocomplete_grouper_sections.cc b/components/omnibox/browser/autocomplete_grouper_sections.cc
index 15f3fac9..a85a019 100644
--- a/components/omnibox/browser/autocomplete_grouper_sections.cc
+++ b/components/omnibox/browser/autocomplete_grouper_sections.cc
@@ -10,7 +10,6 @@
#include "base/containers/contains.h"
#include "base/dcheck_is_on.h"
-#include "base/ranges/algorithm.h"
#include "components/omnibox/browser/autocomplete_grouper_groups.h"
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/omnibox/browser/omnibox_field_trial.h"
@@ -83,7 +82,7 @@
if (group_configs_[group_id].side_type() != side_type_) {
return groups_.end();
}
- return base::ranges::find_if(
+ return std::ranges::find_if(
groups_, [&](const auto& group) { return group.CanAdd(match); });
}
@@ -110,7 +109,7 @@
// Sort matches in the order of their potential containing groups. E.g., if
// `groups_ = {group 1, group 2}, this sorts all matches that can be added to
// group 1 before those that can only be added to group 2.
- base::ranges::stable_sort(matches, std::less<int>{}, [&](const auto& match) {
+ std::ranges::stable_sort(matches, std::less<int>{}, [&](const auto& match) {
// Don't have to handle `FindGroup()` returning `groups_.end()` since
// those matches won't be added to the section anyways.
return std::distance(groups_.begin(), FindGroup(match));
@@ -156,7 +155,7 @@
omnibox::GroupConfig_SideType_DEFAULT_PRIMARY) {}
void AndroidNonZPSSection::InitFromMatches(ACMatches& matches) {
- auto rich_answer_match = base::ranges::find_if(
+ auto rich_answer_match = std::ranges::find_if(
matches,
[&](const auto& match) { return match.answer_template.has_value(); });
bool has_rich_answer = rich_answer_match != matches.end();
@@ -164,7 +163,7 @@
return;
}
- bool has_url = base::ranges::any_of(matches, [](const auto& match) {
+ bool has_url = std::ranges::any_of(matches, [](const auto& match) {
return !AutocompleteMatch::IsSearchType(match.type);
});
bool hide_if_urls_present =
@@ -351,18 +350,18 @@
auto& nav_group = groups_[3];
// Determine if `matches` contains any searches.
- bool has_search = base::ranges::any_of(
+ bool has_search = std::ranges::any_of(
matches, [&](const auto& match) { return search_group.CanAdd(match); });
// Determine if the default match will be a search.
- auto default_match = base::ranges::find_if(
+ auto default_match = std::ranges::find_if(
matches, [&](const auto& match) { return default_group.CanAdd(match); });
bool default_is_search =
default_match != matches.end() && search_group.CanAdd(*default_match);
// Find the 1st nav's index.
size_t first_nav_index = std::distance(
- matches.begin(), base::ranges::find_if(matches, [&](const auto& match) {
+ matches.begin(), std::ranges::find_if(matches, [&](const auto& match) {
return nav_group.CanAdd(match);
}));
diff --git a/components/omnibox/browser/autocomplete_grouper_sections_unittest.cc b/components/omnibox/browser/autocomplete_grouper_sections_unittest.cc
index 3e6eb2b..3856976 100644
--- a/components/omnibox/browser/autocomplete_grouper_sections_unittest.cc
+++ b/components/omnibox/browser/autocomplete_grouper_sections_unittest.cc
@@ -29,8 +29,8 @@
void VerifyMatches(const ACMatches& matches,
std::vector<int> expected_relevances) {
std::vector<int> relevances = {};
- base::ranges::transform(matches, std::back_inserter(relevances),
- [&](const auto& match) { return match.relevance; });
+ std::ranges::transform(matches, std::back_inserter(relevances),
+ [&](const auto& match) { return match.relevance; });
EXPECT_THAT(relevances, testing::ElementsAreArray(expected_relevances));
}
diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc
index 8668472..72890a3 100644
--- a/components/omnibox/browser/autocomplete_match.cc
+++ b/components/omnibox/browser/autocomplete_match.cc
@@ -17,7 +17,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -1497,7 +1496,7 @@
bool AutocompleteMatch::IsVerbatimUrlSuggestion() const {
return type == AutocompleteMatchType::URL_WHAT_YOU_TYPED ||
- base::ranges::any_of(duplicate_matches, [](const auto& match) {
+ std::ranges::any_of(duplicate_matches, [](const auto& match) {
return match.type == AutocompleteMatchType::URL_WHAT_YOU_TYPED;
});
}
@@ -1619,7 +1618,7 @@
// If any of the duplicates under this match are ineligible for ML scoring,
// then the top-level match (this) is also considered ineligible for ML
// scoring.
- if (base::ranges::any_of(duplicate_matches, [](const auto& match) {
+ if (std::ranges::any_of(duplicate_matches, [](const auto& match) {
return !match.IsMlScoringEligible();
})) {
return false;
@@ -1645,7 +1644,7 @@
// Find the type of object we can keep.
auto allowed_action_id_iter =
- base::ranges::find_if(allowed_action_ids, [this](auto allowed_action_id) {
+ std::ranges::find_if(allowed_action_ids, [this](auto allowed_action_id) {
return GetActionWhere([allowed_action_id](const auto& action) {
return action->ActionId() == allowed_action_id;
}) != nullptr;
@@ -1709,9 +1708,9 @@
}
bool AutocompleteMatch::SupportsDeletion() const {
- return deletable ||
- base::ranges::any_of(duplicate_matches,
- [](const auto& m) { return m.deletable; });
+ return deletable || std::ranges::any_of(duplicate_matches, [](const auto& m) {
+ return m.deletable;
+ });
}
AutocompleteMatch
diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h
index 3a304e57..bbcfb85 100644
--- a/components/omnibox/browser/autocomplete_match.h
+++ b/components/omnibox/browser/autocomplete_match.h
@@ -11,6 +11,7 @@
#include <map>
#include <memory>
#include <optional>
+#include <ranges>
#include <string>
#include <utility>
#include <vector>
@@ -18,7 +19,6 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/ranges/ranges.h"
#include "base/strings/utf_offset_string_conversions.h"
#include "build/build_config.h"
#include "components/omnibox/browser/actions/omnibox_action_concepts.h"
@@ -692,7 +692,7 @@
template <typename UnaryPredicate>
bool MatchOrDuplicateMeets(UnaryPredicate predicate) const {
return predicate(*this) ||
- base::ranges::any_of(duplicate_matches, std::move(predicate));
+ std::ranges::any_of(duplicate_matches, std::move(predicate));
}
// Finds first action where `predicate` returns true. This is a special use
@@ -700,7 +700,7 @@
// need to be selected. If no such action is found, returns nullptr.
template <typename UnaryPredicate>
OmniboxAction* GetActionWhere(UnaryPredicate predicate) const {
- auto it = base::ranges::find_if(actions, std::move(predicate));
+ auto it = std::ranges::find_if(actions, std::move(predicate));
return it != actions.end() ? it->get() : nullptr;
}
diff --git a/components/omnibox/browser/autocomplete_provider.cc b/components/omnibox/browser/autocomplete_provider.cc
index a4844310..1d47a9f 100644
--- a/components/omnibox/browser/autocomplete_provider.cc
+++ b/components/omnibox/browser/autocomplete_provider.cc
@@ -316,9 +316,9 @@
// The provider should pass all match candidates to the controller if ML
// scoring is enabled. Mark any matches over `max_matches` with zero relevance
// and `culled_by_provider` set to true to simulate the resizing.
- base::ranges::for_each(std::next(matches_.begin(), max_matches),
- matches_.end(), [&](auto& match) {
- match.relevance = 0;
- match.culled_by_provider = true;
- });
+ std::ranges::for_each(std::next(matches_.begin(), max_matches),
+ matches_.end(), [&](auto& match) {
+ match.relevance = 0;
+ match.culled_by_provider = true;
+ });
}
diff --git a/components/omnibox/browser/autocomplete_provider_unittest.cc b/components/omnibox/browser/autocomplete_provider_unittest.cc
index fb81ef8e..5187b54 100644
--- a/components/omnibox/browser/autocomplete_provider_unittest.cc
+++ b/components/omnibox/browser/autocomplete_provider_unittest.cc
@@ -1815,19 +1815,19 @@
// The first `max_matches` matches should keep their relevance score and have
// `culled_by_provider` set to false.
ACMatches provider_matches = provider->get_matches();
- base::ranges::for_each(provider_matches.begin(),
- std::next(provider_matches.begin(), kMaxMatches),
- [&](auto match) {
- EXPECT_NE(match.relevance, 0);
- EXPECT_FALSE(match.culled_by_provider);
- });
+ std::ranges::for_each(provider_matches.begin(),
+ std::next(provider_matches.begin(), kMaxMatches),
+ [&](auto match) {
+ EXPECT_NE(match.relevance, 0);
+ EXPECT_FALSE(match.culled_by_provider);
+ });
// Any match beyond that should have their relevance score zeroed and
// `culled_by_provider` set.
- base::ranges::for_each(std::next(provider_matches.begin(), kMaxMatches),
- provider_matches.end(), [&](auto match) {
- EXPECT_EQ(match.relevance, 0);
- EXPECT_TRUE(match.culled_by_provider);
- });
+ std::ranges::for_each(std::next(provider_matches.begin(), kMaxMatches),
+ provider_matches.end(), [&](auto match) {
+ EXPECT_EQ(match.relevance, 0);
+ EXPECT_TRUE(match.culled_by_provider);
+ });
// Now disable the flag. With ML Scoring disabled, `matches_` should actually
// be resized and `relevance` and `culled_by_provider` should be untouched.
@@ -1836,7 +1836,7 @@
provider->ResizeMatches(kMaxMatches, false);
EXPECT_EQ(provider->get_matches().size(), kMaxMatches);
- base::ranges::for_each(provider->get_matches(), [&](auto match) {
+ std::ranges::for_each(provider->get_matches(), [&](auto match) {
EXPECT_NE(match.relevance, 0);
EXPECT_FALSE(match.culled_by_provider);
});
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
index 8a74c77a..476c12b 100644
--- a/components/omnibox/browser/autocomplete_result.cc
+++ b/components/omnibox/browser/autocomplete_result.cc
@@ -4,6 +4,7 @@
#include "components/omnibox/browser/autocomplete_result.h"
+#include <algorithm>
#include <functional>
#include <iterator>
#include <optional>
@@ -23,7 +24,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/trace_event/memory_usage_estimator.h"
@@ -354,7 +354,7 @@
const auto default_match_fields =
GetMatchComparisonFields(default_match_to_preserve.value());
const auto preserved_default_match =
- base::ranges::find_if(matches_, [&](const AutocompleteMatch& match) {
+ std::ranges::find_if(matches_, [&](const AutocompleteMatch& match) {
// Find a duplicate match. Don't preserve suggestions that are not
// default-able; e.g., typing 'xy' shouldn't preserve default
// 'xz.com/xy'.
@@ -404,7 +404,7 @@
// matches will instead set IDs here to keep providers 'dumb' and the
// type->group mapping consistent between providers.
if (use_grouping) {
- base::ranges::for_each(matches_, [&](auto& match) {
+ std::ranges::for_each(matches_, [&](auto& match) {
if (!match.suggestion_group_id.has_value()) {
match.suggestion_group_id =
AutocompleteMatch::GetDefaultGroupId(match.type);
@@ -456,7 +456,7 @@
} else if (omnibox::IsNTPPage(page_classification)) {
// IPH is shown for NTP ZPS in the Omnibox only. If it is shown, reduce
// the limit of the normal NTP ZPS Section to make room for the IPH.
- bool has_iph_match = base::ranges::any_of(
+ bool has_iph_match = std::ranges::any_of(
matches_, [](auto match) { return match.IsIPHSuggestion(); });
bool add_iph_section =
page_classification != OmniboxEventProto::NTP_REALBOX &&
@@ -477,7 +477,7 @@
sections.push_back(std::make_unique<DesktopSecondaryNTPZpsSection>(
suggestion_groups_map_));
// Report whether secondary zero-prefix suggestions were triggered.
- if (base::ranges::any_of(
+ if (std::ranges::any_of(
suggestion_groups_map_, [](const auto& entry) {
return entry.second.side_type() ==
omnibox::GroupConfig_SideType_SECONDARY;
@@ -655,7 +655,7 @@
std::vector<OmniboxActionId> include_only_answer_actions{
OmniboxActionId::ANSWER_ACTION};
- bool has_url = base::ranges::any_of(matches_, [](const auto& match) {
+ bool has_url = std::ranges::any_of(matches_, [](const auto& match) {
return !AutocompleteMatch::IsSearchType(match.type);
});
bool hide_answer_actions_when_url_present =
@@ -741,7 +741,7 @@
// 2) Suggestions in SECTION_DEFAULT (0) and suggestions whose groups are not
// in `suggestion_groups_map_` are sorted 2nd.
// 3) Remaining suggestions are sorted by section.
- base::ranges::stable_sort(
+ std::ranges::stable_sort(
matches_, [](int a, int b) { return a < b; },
[&](const auto& m) {
return m.suggestion_group_id.has_value()
@@ -984,8 +984,8 @@
}
return best;
}
- return base::ranges::find_if(*matches,
- &AutocompleteMatch::allowed_to_be_default_match);
+ return std::ranges::find_if(*matches,
+ &AutocompleteMatch::allowed_to_be_default_match);
}
// static
@@ -1498,7 +1498,7 @@
// Prevent old matches from this provider from outranking new ones and
// becoming the default match by capping old matches' scores to be less than
// the highest-scoring allowed-to-be-default match from this provider.
- auto i = base::ranges::find_if(
+ auto i = std::ranges::find_if(
new_matches, &AutocompleteMatch::allowed_to_be_default_match);
// If the provider doesn't have any matches that are allowed-to-be-default,
@@ -1551,7 +1551,7 @@
size_t max_url_count,
const CompareWithDemoteByType<AutocompleteMatch>& comparing_object) {
size_t search_count =
- base::ranges::count_if(matches_, [&](const AutocompleteMatch& m) {
+ std::ranges::count_if(matches_, [&](const AutocompleteMatch& m) {
return AutocompleteMatch::IsSearchType(m.type) &&
// Don't count if would be removed.
comparing_object.GetDemotedRelevance(m) > 0;
@@ -1581,6 +1581,6 @@
if (begin == end)
return;
- base::ranges::stable_sort(begin, end, {},
- [](const auto& m) { return m.GetSortingOrder(); });
+ std::ranges::stable_sort(begin, end, {},
+ [](const auto& m) { return m.GetSortingOrder(); });
}
diff --git a/components/omnibox/browser/autocomplete_result_unittest.cc b/components/omnibox/browser/autocomplete_result_unittest.cc
index 66c2c1c..3816c03 100644
--- a/components/omnibox/browser/autocomplete_result_unittest.cc
+++ b/components/omnibox/browser/autocomplete_result_unittest.cc
@@ -11,6 +11,7 @@
#include <stddef.h>
+#include <algorithm>
#include <iterator>
#include <memory>
#include <string>
@@ -19,7 +20,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/field_trial_params.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -2429,16 +2429,16 @@
TEST_F(AutocompleteResultTest, MaybeCullTailSuggestions) {
auto test = [&](std::vector<CullTailTestMatch> input_matches) {
ACMatches matches;
- base::ranges::transform(input_matches, std::back_inserter(matches),
- [&](const CullTailTestMatch& test_match) {
- AutocompleteMatch match;
- match.contents = test_match.id;
- match.type = test_match.type;
- match.allowed_to_be_default_match =
- test_match.allowed_default;
- match.relevance = 1000;
- return match;
- });
+ std::ranges::transform(input_matches, std::back_inserter(matches),
+ [&](const CullTailTestMatch& test_match) {
+ AutocompleteMatch match;
+ match.contents = test_match.id;
+ match.type = test_match.type;
+ match.allowed_to_be_default_match =
+ test_match.allowed_default;
+ match.relevance = 1000;
+ return match;
+ });
auto page_classification = metrics::OmniboxEventProto::PageClassification::
OmniboxEventProto_PageClassification_OTHER;
@@ -2446,7 +2446,7 @@
&matches, {page_classification});
std::vector<CullTailTestMatch> output_matches;
- base::ranges::transform(
+ std::ranges::transform(
matches, std::back_inserter(output_matches), [](const auto& match) {
return CullTailTestMatch{match.contents, match.type,
match.allowed_to_be_default_match};
diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
index 477728b..0c093505 100644
--- a/components/omnibox/browser/base_search_provider.cc
+++ b/components/omnibox/browser/base_search_provider.cc
@@ -15,7 +15,6 @@
#include "base/functional/bind.h"
#include "base/i18n/case_conversion.h"
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/omnibox/browser/actions/omnibox_action_in_suggest.h"
@@ -228,7 +227,7 @@
}
if (is_android && is_google && suggestion.answer_template()) {
- base::ranges::transform(
+ std::ranges::transform(
suggestion.answer_template()->enhancements().enhancements(),
std::back_inserter(match.actions),
[&](const omnibox::SuggestionEnhancement& enhancement) {
diff --git a/components/omnibox/browser/calculator_provider.cc b/components/omnibox/browser/calculator_provider.cc
index ad803f0..f8894e5 100644
--- a/components/omnibox/browser/calculator_provider.cc
+++ b/components/omnibox/browser/calculator_provider.cc
@@ -4,11 +4,11 @@
#include "calculator_provider.h"
+#include <algorithm>
#include <limits>
#include <vector>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "components/omnibox/browser/autocomplete_input.h"
@@ -70,7 +70,7 @@
}
void CalculatorProvider::DeleteMatch(const AutocompleteMatch& match) {
- auto it = base::ranges::find_if(Cache(), [&](const auto& cached) {
+ auto it = std::ranges::find_if(Cache(), [&](const auto& cached) {
return cached.match.destination_url == match.destination_url;
});
if (it != Cache().end()) {
@@ -120,7 +120,7 @@
Cache().pop_back();
// Remove duplicates to avoid a repeated match reducing cache capacity.
- auto duplicate = base::ranges::find_if(Cache(), [&](const auto& cached) {
+ auto duplicate = std::ranges::find_if(Cache(), [&](const auto& cached) {
return cached.match.contents == match.contents;
});
if (duplicate != Cache().end())
diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibox/browser/document_provider.cc
index 28d4332a..a7cb975 100644
--- a/components/omnibox/browser/document_provider.cc
+++ b/components/omnibox/browser/document_provider.cc
@@ -26,7 +26,6 @@
#include "base/json/json_reader.h"
#include "base/metrics/histogram_functions.h"
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -185,7 +184,7 @@
std::vector<const std::string*> owner_emails = ExtractResultList(
result, "metadata.owner.emailAddresses", "emailAddress");
const auto lower_user = base::i18n::ToLower(base::UTF8ToUTF16(user));
- return base::ranges::any_of(
+ return std::ranges::any_of(
owner_emails,
[&](const std::u16string& email) { return lower_user == email; },
[&](const std::string* email) {
@@ -222,7 +221,7 @@
// It's possible `input` contained 'owner' as a word, as opposed to
// 'owner:...' as an operator. Ignore this rare edge case for simplicity.
if (input_word != u"owner" &&
- base::ranges::none_of(
+ std::ranges::none_of(
title_and_owner_words, [&](const std::u16string& title_word) {
return base::StartsWith(title_word, input_word,
base::CompareCase::INSENSITIVE_ASCII);
@@ -861,7 +860,7 @@
}
void DocumentProvider::CopyCachedMatchesToMatches() {
- base::ranges::transform(
+ std::ranges::transform(
matches_cache_, std::back_inserter(matches_),
[this](auto match) {
match.allowed_to_be_default_match = false;
@@ -877,7 +876,7 @@
}
void DocumentProvider::SetCachedMatchesScoresTo0() {
- base::ranges::for_each(matches_cache_, [&](auto& cache_key_match_pair) {
+ std::ranges::for_each(matches_cache_, [&](auto& cache_key_match_pair) {
cache_key_match_pair.second.relevance = 0;
});
}
diff --git a/components/omnibox/browser/document_provider_unittest.cc b/components/omnibox/browser/document_provider_unittest.cc
index d9ce922..bab00e6 100644
--- a/components/omnibox/browser/document_provider_unittest.cc
+++ b/components/omnibox/browser/document_provider_unittest.cc
@@ -4,6 +4,7 @@
#include "components/omnibox/browser/document_provider.h"
+#include <algorithm>
#include <iterator>
#include <map>
#include <memory>
@@ -14,7 +15,6 @@
#include "base/i18n/time_formatting.h"
#include "base/json/json_reader.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
@@ -113,7 +113,7 @@
using Summary = std::tuple<const std::u16string, int, bool>;
static std::vector<Summary> ExtractMatchSummary(const ACMatches& matches) {
std::vector<Summary> summaries;
- base::ranges::transform(
+ std::ranges::transform(
matches, std::back_inserter(summaries), [](const auto& match) {
return Summary{
match.contents, match.relevance,
diff --git a/components/omnibox/browser/featured_search_provider.cc b/components/omnibox/browser/featured_search_provider.cc
index 5955ce6d..e91e179 100644
--- a/components/omnibox/browser/featured_search_provider.cc
+++ b/components/omnibox/browser/featured_search_provider.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <climits>
#include <iterator>
#include <ranges>
@@ -13,7 +14,6 @@
#include <vector>
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -418,7 +418,7 @@
template_url_service_->GetFeaturedEnterpriseSearchEngines();
return input.IsZeroSuggest() && !featured_engines.empty() &&
ShouldShowIPH(IphType::kFeaturedEnterpriseSearch) &&
- base::ranges::all_of(featured_engines, [](auto turl) {
+ std::ranges::all_of(featured_engines, [](auto turl) {
return turl->usage_count() == 0;
});
}
@@ -446,12 +446,12 @@
void FeaturedSearchProvider::AddFeaturedEnterpriseSearchIPHMatch() {
std::vector<std::string> sites;
- base::ranges::transform(
+ std::ranges::transform(
template_url_service_->GetFeaturedEnterpriseSearchEngines(),
std::back_inserter(sites), [](auto turl) {
return url_formatter::StripWWW(GURL(turl->url()).host());
});
- base::ranges::sort(sites);
+ std::ranges::sort(sites);
AddIPHMatch(IphType::kFeaturedEnterpriseSearch,
l10n_util::GetStringFUTF16(
IDS_OMNIBOX_FEATURED_ENTERPRISE_SITE_SEARCH_IPH,
diff --git a/components/omnibox/browser/history_fuzzy_provider.cc b/components/omnibox/browser/history_fuzzy_provider.cc
index c75b419..8676272f 100644
--- a/components/omnibox/browser/history_fuzzy_provider.cc
+++ b/components/omnibox/browser/history_fuzzy_provider.cc
@@ -449,7 +449,7 @@
void HistoryFuzzyProvider::RecordOpenMatchMetrics(
const AutocompleteResult& result,
const AutocompleteMatch& match_opened) {
- if (base::ranges::any_of(result, [](const AutocompleteMatch& match) {
+ if (std::ranges::any_of(result, [](const AutocompleteMatch& match) {
return match.provider && match.provider->type() ==
AutocompleteProvider::TYPE_HISTORY_FUZZY;
})) {
diff --git a/components/omnibox/browser/history_fuzzy_provider_unittest.cc b/components/omnibox/browser/history_fuzzy_provider_unittest.cc
index ff702ed9..8bf62afe 100644
--- a/components/omnibox/browser/history_fuzzy_provider_unittest.cc
+++ b/components/omnibox/browser/history_fuzzy_provider_unittest.cc
@@ -9,10 +9,10 @@
#include "components/omnibox/browser/history_fuzzy_provider.h"
+#include <algorithm>
#include <vector>
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -26,7 +26,7 @@
template <typename Container, typename Item>
void SwapRemoveElement(Container& container, const Item& item) {
- typename Container::iterator it = base::ranges::find(container, item);
+ typename Container::iterator it = std::ranges::find(container, item);
if (it == container.end()) {
return;
}
diff --git a/components/omnibox/browser/history_quick_provider_unittest.cc b/components/omnibox/browser/history_quick_provider_unittest.cc
index 9a019dd..82bb881 100644
--- a/components/omnibox/browser/history_quick_provider_unittest.cc
+++ b/components/omnibox/browser/history_quick_provider_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <array>
#include <functional>
#include <memory>
@@ -15,7 +16,6 @@
#include "base/containers/to_vector.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
@@ -1126,9 +1126,8 @@
provider().Start(input, false);
auto matches = provider().matches();
std::vector<std::u16string> match_titles;
- base::ranges::transform(
- matches, std::back_inserter(match_titles),
- [](const auto& match) { return match.description; });
+ std::ranges::transform(matches, std::back_inserter(match_titles),
+ [](const auto& match) { return match.description; });
EXPECT_THAT(match_titles, testing::ElementsAreArray(expected_matches));
EXPECT_EQ(client()
diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
index 00084e7..bd7840d8 100644
--- a/components/omnibox/browser/history_url_provider.cc
+++ b/components/omnibox/browser/history_url_provider.cc
@@ -17,7 +17,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
@@ -1089,7 +1088,7 @@
// Find the first occurrence of any URL in the redirect chain. We want to
// keep this one since it is rated the highest.
- history::HistoryMatches::iterator first(base::ranges::find_first_of(
+ history::HistoryMatches::iterator first(std::ranges::find_first_of(
*matches, remove, history::HistoryMatch::EqualsGURL));
CHECK(first != matches->end(), base::NotFatalUntil::M130)
<< "We should have always found at least the "
diff --git a/components/omnibox/browser/in_memory_url_index_types.cc b/components/omnibox/browser/in_memory_url_index_types.cc
index 9281021..c25f99b 100644
--- a/components/omnibox/browser/in_memory_url_index_types.cc
+++ b/components/omnibox/browser/in_memory_url_index_types.cc
@@ -4,13 +4,13 @@
#include "components/omnibox/browser/in_memory_url_index_types.h"
+#include <algorithm>
#include <functional>
#include <iterator>
#include <numeric>
#include <set>
#include "base/i18n/case_conversion.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/string_util.h"
#include "base/trace_event/memory_usage_estimator.h"
@@ -83,7 +83,7 @@
// Assumes |sorted_matches| is already sorted.
TermMatches DeoverlapMatches(const TermMatches& sorted_matches) {
TermMatches out;
- base::ranges::copy_if(
+ std::ranges::copy_if(
sorted_matches, std::back_inserter(out), [&out](const TermMatch& match) {
return out.empty() ||
match.offset >= (out.back().offset + out.back().length);
diff --git a/components/omnibox/browser/in_memory_url_index_unittest.cc b/components/omnibox/browser/in_memory_url_index_unittest.cc
index cf964a8..fa33a2c 100644
--- a/components/omnibox/browser/in_memory_url_index_unittest.cc
+++ b/components/omnibox/browser/in_memory_url_index_unittest.cc
@@ -12,6 +12,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <fstream>
#include <memory>
#include <numeric>
@@ -24,7 +25,6 @@
#include "base/i18n/case_conversion.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -401,10 +401,10 @@
ASSERT_TRUE(actual_starts != actual.word_starts_map_.end());
const RowWordStarts& expected_word_starts(expected_starts.second);
const RowWordStarts& actual_word_starts(actual_starts->second);
- EXPECT_TRUE(base::ranges::equal(expected_word_starts.url_word_starts_,
- actual_word_starts.url_word_starts_));
- EXPECT_TRUE(base::ranges::equal(expected_word_starts.title_word_starts_,
- actual_word_starts.title_word_starts_));
+ EXPECT_TRUE(std::ranges::equal(expected_word_starts.url_word_starts_,
+ actual_word_starts.url_word_starts_));
+ EXPECT_TRUE(std::ranges::equal(expected_word_starts.title_word_starts_,
+ actual_word_starts.title_word_starts_));
}
}
@@ -713,7 +713,7 @@
auto CountGroupElementsInIds = [](const ItemGroup& group,
const HistoryIDVector& ids) {
- return base::ranges::count_if(ids, [&](history::URLID id) {
+ return std::ranges::count_if(ids, [&](history::URLID id) {
return group.min_id <= id && id < group.max_id;
});
};
@@ -758,7 +758,7 @@
// Each next group should fill almost everything, while the previous group
// should occupy what's left.
- auto* error_position = base::ranges::adjacent_find(
+ auto* error_position = std::ranges::adjacent_find(
item_groups, [&](const ItemGroup& previous, const ItemGroup& current) {
auto ids = GetHistoryIdsUpTo(current.max_id);
EXPECT_TRUE(GetPrivateData()->TrimHistoryIdsPool(&ids));
diff --git a/components/omnibox/browser/open_tab_provider.cc b/components/omnibox/browser/open_tab_provider.cc
index 836d5610..bd3309b 100644
--- a/components/omnibox/browser/open_tab_provider.cc
+++ b/components/omnibox/browser/open_tab_provider.cc
@@ -4,8 +4,9 @@
#include "components/omnibox/browser/open_tab_provider.h"
+#include <algorithm>
+
#include "base/i18n/case_conversion.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/omnibox/browser/autocomplete_input.h"
@@ -59,7 +60,7 @@
// Every input term must be included in either (or both) the title or URL.
query_parser::Snippet::MatchPositions title_matches;
query_parser::Snippet::MatchPositions url_matches;
- if (!base::ranges::all_of(input_query_nodes, [&](const auto& query_node) {
+ if (!std::ranges::all_of(input_query_nodes, [&](const auto& query_node) {
// Using local vars so to not short circuit adding URL matches when
// title matches are found.
const bool has_title_match =
diff --git a/components/omnibox/browser/scored_history_match.cc b/components/omnibox/browser/scored_history_match.cc
index bbfe3f9..29df2c9 100644
--- a/components/omnibox/browser/scored_history_match.cc
+++ b/components/omnibox/browser/scored_history_match.cc
@@ -6,6 +6,7 @@
#include <math.h>
+#include <algorithm>
#include <array>
#include <optional>
#include <string>
@@ -15,7 +16,6 @@
#include "base/check_op.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -919,8 +919,8 @@
auto visits_end =
visits.begin() + std::min(visits.size(), max_visits_to_score_);
// Visits should be in newest to oldest order.
- DCHECK(base::ranges::adjacent_find(visits.begin(), visits_end, std::less<>(),
- &history::VisitInfo::first) == visits_end);
+ DCHECK(std::ranges::adjacent_find(visits.begin(), visits_end, std::less<>(),
+ &history::VisitInfo::first) == visits_end);
for (auto i = visits.begin(); i != visits_end; ++i) {
const bool is_page_transition_typed =
ui::PageTransitionCoreTypeIs(i->second, ui::PAGE_TRANSITION_TYPED);
diff --git a/components/omnibox/browser/scored_history_match_unittest.cc b/components/omnibox/browser/scored_history_match_unittest.cc
index 976f713..ffeca50 100644
--- a/components/omnibox/browser/scored_history_match_unittest.cc
+++ b/components/omnibox/browser/scored_history_match_unittest.cc
@@ -4,6 +4,7 @@
#include "components/omnibox/browser/scored_history_match.h"
+#include <algorithm>
#include <memory>
#include <numeric>
#include <string>
@@ -12,7 +13,6 @@
#include "base/auto_reset.h"
#include "base/functional/bind.h"
#include "base/i18n/break_iterator.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/gtest_util.h"
#include "base/test/scoped_feature_list.h"
@@ -163,7 +163,7 @@
const GURL& url,
const std::u16string& title) {
String16Vector term_vector;
- base::ranges::transform(
+ std::ranges::transform(
terms, std::back_inserter(term_vector),
[](const auto& term) { return base::UTF8ToUTF16(term); });
std::string terms_joint =
diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
index b86bf71..bfcf964 100644
--- a/components/omnibox/browser/search_provider.cc
+++ b/components/omnibox/browser/search_provider.cc
@@ -1111,7 +1111,7 @@
}
void SearchProvider::DuplicateCardAnswer(ACMatches* matches) {
- auto iter = base::ranges::find_if(*matches, [](const auto& match) {
+ auto iter = std::ranges::find_if(*matches, [](const auto& match) {
return match.answer_template.has_value();
});
diff --git a/components/omnibox/browser/search_suggestion_parser.cc b/components/omnibox/browser/search_suggestion_parser.cc
index 848cc7c4..05bd1cd3 100644
--- a/components/omnibox/browser/search_suggestion_parser.cc
+++ b/components/omnibox/browser/search_suggestion_parser.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <optional>
#include <string_view>
@@ -19,7 +20,6 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/omnibox/browser/shortcuts_backend.cc b/components/omnibox/browser/shortcuts_backend.cc
index 77241d3..6aeadee 100644
--- a/components/omnibox/browser/shortcuts_backend.cc
+++ b/components/omnibox/browser/shortcuts_backend.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <map>
#include <memory>
#include <set>
@@ -16,7 +17,6 @@
#include "base/functional/bind.h"
#include "base/i18n/case_conversion.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -446,7 +446,7 @@
ShortcutsDatabase::ShortcutIDs shortcut_ids;
for (const auto& guid_pair : guid_map_) {
- if (base::ranges::any_of(
+ if (std::ranges::any_of(
deletion_info.deleted_rows(),
history::URLRow::URLRowHasURL(
guid_pair.second->second.match_core.destination_url))) {
diff --git a/components/omnibox/browser/shortcuts_backend_unittest.cc b/components/omnibox/browser/shortcuts_backend_unittest.cc
index 865c227..8e824c74 100644
--- a/components/omnibox/browser/shortcuts_backend_unittest.cc
+++ b/components/omnibox/browser/shortcuts_backend_unittest.cc
@@ -2,16 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
#include "components/omnibox/browser/shortcuts_backend.h"
#include <stddef.h>
+#include <algorithm>
#include <iterator>
#include <memory>
#include "base/files/scoped_temp_dir.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
@@ -212,8 +211,8 @@
std::vector<std::u16string> ShortcutsBackendTest::ShortcutsMapTexts() const {
std::vector<std::u16string> texts;
- base::ranges::transform(shortcuts_map(), std::back_inserter(texts),
- [](const auto& entry) { return entry.second.text; });
+ std::ranges::transform(shortcuts_map(), std::back_inserter(texts),
+ [](const auto& entry) { return entry.second.text; });
return texts;
}
diff --git a/components/omnibox/browser/shortcuts_provider.cc b/components/omnibox/browser/shortcuts_provider.cc
index 6a19ce8c..70012e0 100644
--- a/components/omnibox/browser/shortcuts_provider.cc
+++ b/components/omnibox/browser/shortcuts_provider.cc
@@ -21,7 +21,6 @@
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -81,14 +80,14 @@
// Helpers for extracting aggregated factors from a vector of shortcuts.
const ShortcutsDatabase::Shortcut* ShortestShortcutText(
const std::vector<const ShortcutsDatabase::Shortcut*>& shortcuts) {
- return *base::ranges::min_element(shortcuts, {}, [](const auto* shortcut) {
+ return *std::ranges::min_element(shortcuts, {}, [](const auto* shortcut) {
return shortcut->text.length();
});
}
const ShortcutsDatabase::Shortcut* MostRecentShortcut(
const std::vector<const ShortcutsDatabase::Shortcut*>& shortcuts) {
- return *base::ranges::max_element(shortcuts, {}, [](const auto* shortcut) {
+ return *std::ranges::max_element(shortcuts, {}, [](const auto* shortcut) {
return shortcut->last_access_time;
});
}
@@ -103,7 +102,7 @@
const ShortcutsDatabase::Shortcut* ShortestShortcutContent(
const std::vector<const ShortcutsDatabase::Shortcut*>& shortcuts) {
- return *base::ranges::min_element(shortcuts, {}, [](const auto* shortcut) {
+ return *std::ranges::min_element(shortcuts, {}, [](const auto* shortcut) {
return shortcut->match_core.contents.length();
});
}
@@ -347,7 +346,7 @@
// slot in the URL grouped suggestions. This won't affect the scores of
// other shortcuts, as they're already scored less than
// `kShortcutsProviderDefaultMaxRelevance`.
- const auto best_match = base::ranges::max_element(
+ const auto best_match = std::ranges::max_element(
shortcut_matches, {}, [](const auto& shortcut_match) {
return shortcut_match.aggregate_number_of_hits;
});
@@ -381,7 +380,7 @@
// Create and initialize autocomplete matches from shortcut matches.
matches_.reserve(shortcut_matches.size() +
history_cluster_shortcut_matches.size());
- base::ranges::transform(
+ std::ranges::transform(
shortcut_matches, std::back_inserter(matches_),
[&](const auto& shortcut_match) {
// Guarantee that all relevance scores are decreasing (but do not assign
@@ -399,7 +398,7 @@
});
ResizeMatches(provider_max_matches_, ignore_provider_limit);
- base::ranges::transform(
+ std::ranges::transform(
history_cluster_shortcut_matches, std::back_inserter(matches_),
[&](const auto& shortcut_match) {
auto match =
diff --git a/components/omnibox/browser/shortcuts_provider_test_util.cc b/components/omnibox/browser/shortcuts_provider_test_util.cc
index 5bf9862..da16892 100644
--- a/components/omnibox/browser/shortcuts_provider_test_util.cc
+++ b/components/omnibox/browser/shortcuts_provider_test_util.cc
@@ -9,7 +9,8 @@
#include "components/omnibox/browser/shortcuts_provider_test_util.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -118,7 +119,7 @@
EXPECT_EQ(expected_urls.size(), ac_matches.size()) << debug;
for (const auto& expected_url : expected_urls) {
- EXPECT_TRUE(base::ranges::any_of(
+ EXPECT_TRUE(std::ranges::any_of(
ac_matches,
[&expected_url](const AutocompleteMatch& match) {
return expected_url.first == match.destination_url.spec() &&
diff --git a/components/omnibox/browser/titled_url_match_utils_unittest.cc b/components/omnibox/browser/titled_url_match_utils_unittest.cc
index b6d5343..925c4024 100644
--- a/components/omnibox/browser/titled_url_match_utils_unittest.cc
+++ b/components/omnibox/browser/titled_url_match_utils_unittest.cc
@@ -4,11 +4,11 @@
#include "components/omnibox/browser/titled_url_match_utils.h"
+#include <algorithm>
#include <memory>
#include <string_view>
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
@@ -43,7 +43,7 @@
std::vector<std::u16string_view> GetTitledUrlNodeAncestorTitles()
const override {
std::vector<std::u16string_view> ancestors;
- base::ranges::transform(
+ std::ranges::transform(
ancestors_, std::back_inserter(ancestors),
[](auto& ancestor) { return std::u16string_view(ancestor); });
return ancestors;
@@ -118,14 +118,14 @@
EXPECT_EQ(relevance, autocomplete_match.relevance);
EXPECT_EQ(match_url, autocomplete_match.destination_url);
EXPECT_EQ(u"google.com", autocomplete_match.contents);
- EXPECT_TRUE(base::ranges::equal(expected_contents_class,
- autocomplete_match.contents_class))
+ EXPECT_TRUE(std::ranges::equal(expected_contents_class,
+ autocomplete_match.contents_class))
<< "EXPECTED: " << ACMatchClassificationsAsString(expected_contents_class)
<< "ACTUAL: "
<< ACMatchClassificationsAsString(autocomplete_match.contents_class);
EXPECT_EQ(match_title, autocomplete_match.description);
- EXPECT_TRUE(base::ranges::equal(expected_description_class,
- autocomplete_match.description_class));
+ EXPECT_TRUE(std::ranges::equal(expected_description_class,
+ autocomplete_match.description_class));
EXPECT_EQ(u"https://www.google.com", autocomplete_match.fill_into_edit);
EXPECT_TRUE(autocomplete_match.allowed_to_be_default_match);
EXPECT_EQ(expected_inline_autocompletion,
@@ -176,8 +176,8 @@
EXPECT_EQ(match_url, autocomplete_match.destination_url);
EXPECT_EQ(expected_contents, autocomplete_match.contents);
- EXPECT_TRUE(base::ranges::equal(expected_contents_class,
- autocomplete_match.contents_class))
+ EXPECT_TRUE(std::ranges::equal(expected_contents_class,
+ autocomplete_match.contents_class))
<< "EXPECTED: " << ACMatchClassificationsAsString(expected_contents_class)
<< "ACTUAL: "
<< ACMatchClassificationsAsString(autocomplete_match.contents_class);
@@ -204,8 +204,8 @@
EXPECT_EQ(match_url, autocomplete_match.destination_url);
EXPECT_EQ(expected_contents, autocomplete_match.contents);
- EXPECT_TRUE(base::ranges::equal(expected_contents_class,
- autocomplete_match.contents_class))
+ EXPECT_TRUE(std::ranges::equal(expected_contents_class,
+ autocomplete_match.contents_class))
<< "EXPECTED: " << ACMatchClassificationsAsString(expected_contents_class)
<< "ACTUAL: "
<< ACMatchClassificationsAsString(autocomplete_match.contents_class);
@@ -228,8 +228,8 @@
EXPECT_EQ(match_url, autocomplete_match.destination_url);
EXPECT_EQ(expected_contents, autocomplete_match.contents);
- EXPECT_TRUE(base::ranges::equal(expected_contents_class,
- autocomplete_match.contents_class))
+ EXPECT_TRUE(std::ranges::equal(expected_contents_class,
+ autocomplete_match.contents_class))
<< "EXPECTED: " << ACMatchClassificationsAsString(expected_contents_class)
<< "ACTUAL: "
<< ACMatchClassificationsAsString(autocomplete_match.contents_class);
@@ -256,8 +256,8 @@
EXPECT_EQ(match_url, autocomplete_match.destination_url);
EXPECT_EQ(expected_contents, autocomplete_match.contents);
- EXPECT_TRUE(base::ranges::equal(expected_contents_class,
- autocomplete_match.contents_class))
+ EXPECT_TRUE(std::ranges::equal(expected_contents_class,
+ autocomplete_match.contents_class))
<< "EXPECTED: " << ACMatchClassificationsAsString(expected_contents_class)
<< "ACTUAL: "
<< ACMatchClassificationsAsString(autocomplete_match.contents_class);
@@ -310,14 +310,14 @@
EXPECT_EQ(relevance, autocomplete_match.relevance);
EXPECT_EQ(match_url, autocomplete_match.destination_url);
EXPECT_EQ(u"gmail.com/google", autocomplete_match.contents);
- EXPECT_TRUE(base::ranges::equal(expected_contents_class,
- autocomplete_match.contents_class))
+ EXPECT_TRUE(std::ranges::equal(expected_contents_class,
+ autocomplete_match.contents_class))
<< "EXPECTED: " << ACMatchClassificationsAsString(expected_contents_class)
<< "ACTUAL: "
<< ACMatchClassificationsAsString(autocomplete_match.contents_class);
EXPECT_EQ(match_title, autocomplete_match.description);
- EXPECT_TRUE(base::ranges::equal(expected_description_class,
- autocomplete_match.description_class));
+ EXPECT_TRUE(std::ranges::equal(expected_description_class,
+ autocomplete_match.description_class));
EXPECT_EQ(u"www.gmail.com/google", autocomplete_match.fill_into_edit);
EXPECT_FALSE(autocomplete_match.allowed_to_be_default_match);
EXPECT_TRUE(autocomplete_match.inline_autocompletion.empty());
diff --git a/components/omnibox/browser/url_index_private_data.cc b/components/omnibox/browser/url_index_private_data.cc
index c4bfbf5..8be511f7 100644
--- a/components/omnibox/browser/url_index_private_data.cc
+++ b/components/omnibox/browser/url_index_private_data.cc
@@ -23,7 +23,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -360,7 +359,7 @@
// Find the matching entry in the history_info_map_.
// To avoid creating a temporary GURL instance,
// the lambda expression should return the GURL reference.
- auto pos = base::ranges::find(
+ auto pos = std::ranges::find(
history_info_map_, url,
[](const std::pair<const HistoryID, HistoryInfoMapValue>& item)
-> const GURL& { return item.second.url_row.url(); });
@@ -703,7 +702,7 @@
bool is_highly_visited_host =
!host_filter.empty() ||
- base::ranges::find(HighlyVisitedHosts(), hist_item.url().host()) !=
+ std::ranges::find(HighlyVisitedHosts(), hist_item.url().host()) !=
HighlyVisitedHosts().end();
ScoredHistoryMatch new_scored_match(
hist_item, hist_pos->second.visits, lower_raw_string, lower_raw_terms,
diff --git a/components/omnibox/browser/zero_suggest_cache_service.cc b/components/omnibox/browser/zero_suggest_cache_service.cc
index 76c72e10..fcb85981 100644
--- a/components/omnibox/browser/zero_suggest_cache_service.cc
+++ b/components/omnibox/browser/zero_suggest_cache_service.cc
@@ -4,13 +4,13 @@
#include "components/omnibox/browser/zero_suggest_cache_service.h"
+#include <algorithm>
#include <iterator>
#include <memory>
#include <utility>
#include "base/feature_list.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "base/values.h"
#include "components/omnibox/browser/autocomplete_input.h"
@@ -164,7 +164,7 @@
std::vector<CacheEntrySuggestResult> suggest_results;
suggest_results.reserve(results.suggest_results.size());
- base::ranges::transform(
+ std::ranges::transform(
results.suggest_results, std::back_inserter(suggest_results),
[](const auto& suggest_result) {
return CacheEntrySuggestResult{suggest_result.subtypes(),
diff --git a/components/optimization_guide/core/model_util_unittest.cc b/components/optimization_guide/core/model_util_unittest.cc
index 00a0b51a..b0ba95c 100644
--- a/components/optimization_guide/core/model_util_unittest.cc
+++ b/components/optimization_guide/core/model_util_unittest.cc
@@ -4,9 +4,10 @@
#include "components/optimization_guide/core/model_util.h"
+#include <algorithm>
+
#include "base/base64.h"
#include "base/command_line.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "components/optimization_guide/core/optimization_guide_switches.h"
@@ -31,8 +32,8 @@
EXPECT_NE(GetModelCacheKeyHash(CreateModelCacheKey("en-US")),
GetModelCacheKeyHash(CreateModelCacheKey("en-UK")));
EXPECT_TRUE(
- base::ranges::all_of(GetModelCacheKeyHash(CreateModelCacheKey("en-US")),
- [](char ch) { return base::IsHexDigit(ch); }));
+ std::ranges::all_of(GetModelCacheKeyHash(CreateModelCacheKey("en-US")),
+ [](char ch) { return base::IsHexDigit(ch); }));
}
TEST(ModelUtilTest, PredictionModelVersionInKillSwitch) {
diff --git a/components/optimization_guide/core/prediction_model_override_unittest.cc b/components/optimization_guide/core/prediction_model_override_unittest.cc
index 21253ad..945fdf90 100644
--- a/components/optimization_guide/core/prediction_model_override_unittest.cc
+++ b/components/optimization_guide/core/prediction_model_override_unittest.cc
@@ -4,9 +4,10 @@
#include "components/optimization_guide/core/prediction_model_override.h"
+#include <algorithm>
+
#include "base/base64.h"
#include "base/command_line.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "components/optimization_guide/core/optimization_guide_switches.h"
diff --git a/components/origin_trials/browser/leveldb_persistence_provider.cc b/components/origin_trials/browser/leveldb_persistence_provider.cc
index bed7c26..2c85374 100644
--- a/components/origin_trials/browser/leveldb_persistence_provider.cc
+++ b/components/origin_trials/browser/leveldb_persistence_provider.cc
@@ -4,6 +4,7 @@
#include "components/origin_trials/browser/leveldb_persistence_provider.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include <vector>
@@ -16,7 +17,6 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/synchronization/lock.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/components/os_crypt/async/browser/os_crypt_async.cc b/components/os_crypt/async/browser/os_crypt_async.cc
index 4d736e3..0ec868f 100644
--- a/components/os_crypt/async/browser/os_crypt_async.cc
+++ b/components/os_crypt/async/browser/os_crypt_async.cc
@@ -4,6 +4,7 @@
#include "components/os_crypt/async/browser/os_crypt_async.h"
+#include <algorithm>
#include <memory>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/check_op.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "base/sequence_checker.h"
#include "components/os_crypt/async/browser/key_provider.h"
#include "components/os_crypt/async/common/encryptor.h"
@@ -31,7 +31,7 @@
return providers;
}
- base::ranges::sort(input_providers, [](const auto& a, const auto& b) {
+ std::ranges::sort(input_providers, [](const auto& a, const auto& b) {
return a.first < b.first;
});
@@ -41,11 +41,11 @@
<< "Cannot have two providers with same precedence.";
}
- base::ranges::transform(std::make_move_iterator(input_providers.begin()),
- std::make_move_iterator(input_providers.end()),
- std::back_inserter(providers), [](auto provider) {
- return std::move(provider.second);
- });
+ std::ranges::transform(std::make_move_iterator(input_providers.begin()),
+ std::make_move_iterator(input_providers.end()),
+ std::back_inserter(providers), [](auto provider) {
+ return std::move(provider.second);
+ });
return providers;
}
diff --git a/components/os_crypt/async/common/encryptor.cc b/components/os_crypt/async/common/encryptor.cc
index fbd3c2a..9c9b238 100644
--- a/components/os_crypt/async/common/encryptor.cc
+++ b/components/os_crypt/async/common/encryptor.cc
@@ -4,6 +4,7 @@
#include "components/os_crypt/async/common/encryptor.h"
+#include <algorithm>
#include <optional>
#include <string>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/check.h"
#include "base/containers/span.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/os_crypt/async/common/algorithm.mojom.h"
#include "components/os_crypt/sync/os_crypt.h"
@@ -276,7 +276,7 @@
if (data.size() < provider.size()) {
continue;
}
- if (base::ranges::equal(provider, data.first(provider.size()))) {
+ if (std::ranges::equal(provider, data.first(provider.size()))) {
// This removes the provider prefix from the front of the data.
auto ciphertext = data.subspan(provider.size());
// The Key does the raw decrypt.
diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc
index 1795fd24..2141ba9 100644
--- a/components/page_content_annotations/core/page_content_annotations_features.cc
+++ b/components/page_content_annotations/core/page_content_annotations_features.cc
@@ -96,7 +96,7 @@
return true;
}
- return base::ranges::any_of(
+ return std::ranges::any_of(
supported_countries, [&country_code](const auto& supported_country_code) {
return base::EqualsCaseInsensitiveASCII(supported_country_code,
country_code);
diff --git a/components/page_content_annotations/core/page_content_annotations_service.cc b/components/page_content_annotations/core/page_content_annotations_service.cc
index feeed796..49326c9 100644
--- a/components/page_content_annotations/core/page_content_annotations_service.cc
+++ b/components/page_content_annotations/core/page_content_annotations_service.cc
@@ -4,6 +4,7 @@
#include "components/page_content_annotations/core/page_content_annotations_service.h"
+#include <algorithm>
#include <iterator>
#include <utility>
@@ -13,7 +14,6 @@
#include "base/i18n/case_conversion.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros_local.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
@@ -599,7 +599,7 @@
if (group->type != continuous_search::mojom::ResultType::kRelatedSearches) {
continue;
}
- base::ranges::transform(
+ std::ranges::transform(
group->results, std::back_inserter(related_searches),
[](const continuous_search::mojom::SearchResultPtr& result) {
return base::UTF16ToUTF8(
diff --git a/components/page_load_metrics/browser/metrics_web_contents_observer.cc b/components/page_load_metrics/browser/metrics_web_contents_observer.cc
index d508426..660bc3b 100644
--- a/components/page_load_metrics/browser/metrics_web_contents_observer.cc
+++ b/components/page_load_metrics/browser/metrics_web_contents_observer.cc
@@ -13,7 +13,6 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "components/page_load_metrics/browser/metrics_lifecycle_observer.h"
@@ -567,7 +566,7 @@
PageLoadTracker& tracker,
const content::CookieAccessDetails& details) {
// TODO(altimin): Propagate `CookieAccessDetails` further.
- bool is_partitioned_access = base::ranges::all_of(
+ bool is_partitioned_access = std::ranges::all_of(
details.cookie_access_result_list,
[](const net::CookieWithAccessResult& cookie_with_access_result) {
return cookie_with_access_result.cookie.IsPartitioned();
diff --git a/components/page_load_metrics/browser/observers/privacy_sandbox_ads_page_load_metrics_observer_unittest.cc b/components/page_load_metrics/browser/observers/privacy_sandbox_ads_page_load_metrics_observer_unittest.cc
index 1972a0b2..bff9f82 100644
--- a/components/page_load_metrics/browser/observers/privacy_sandbox_ads_page_load_metrics_observer_unittest.cc
+++ b/components/page_load_metrics/browser/observers/privacy_sandbox_ads_page_load_metrics_observer_unittest.cc
@@ -4,13 +4,13 @@
#include "components/page_load_metrics/browser/observers/privacy_sandbox_ads_page_load_metrics_observer.h"
+#include <algorithm>
#include <memory>
#include <vector>
#include "base/containers/enum_set.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_set.h"
-#include "base/ranges/algorithm.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/time/time.h"
#include "components/page_load_metrics/browser/observers/page_load_metrics_observer_content_test_harness.h"
@@ -98,7 +98,7 @@
for (auto api :
base::EnumSet<PrivacySandboxAdsApi, PrivacySandboxAdsApi::kMinValue,
PrivacySandboxAdsApi::kMaxValue>::All()) {
- int expected_count = base::ranges::any_of(
+ int expected_count = std::ranges::any_of(
kFeaturesMap.at(api), [&](WebFeature web_feature) {
return web_features.contains(web_feature);
});
diff --git a/components/password_manager/content/browser/password_form_classification_util.cc b/components/password_manager/content/browser/password_form_classification_util.cc
index 704467e..7a198e6 100644
--- a/components/password_manager/content/browser/password_form_classification_util.cc
+++ b/components/password_manager/content/browser/password_form_classification_util.cc
@@ -4,8 +4,9 @@
#include "components/password_manager/content/browser/password_form_classification_util.h"
+#include <ranges>
+
#include "base/containers/to_vector.h"
-#include "base/ranges/ranges.h"
#include "components/autofill/content/browser/renderer_forms_from_browser_form.h"
#include "components/autofill/core/browser/foundations/autofill_manager.h"
#include "components/autofill/core/common/form_data.h"
@@ -29,14 +30,14 @@
}
// Find the form to which `field_id` belongs.
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
renderer_forms.value(),
[field_id](
const std::pair<autofill::FormData, content::GlobalRenderFrameHostId>&
form_rfh_pair) {
const autofill::FormData& form = form_rfh_pair.first;
- return base::ranges::find(form.fields(), field_id,
- &autofill::FormFieldData::global_id) !=
+ return std::ranges::find(form.fields(), field_id,
+ &autofill::FormFieldData::global_id) !=
form.fields().end();
});
if (it == renderer_forms.value().end()) {
diff --git a/components/password_manager/core/browser/affiliation/affiliated_match_helper.cc b/components/password_manager/core/browser/affiliation/affiliated_match_helper.cc
index 517020a..a355500 100644
--- a/components/password_manager/core/browser/affiliation/affiliated_match_helper.cc
+++ b/components/password_manager/core/browser/affiliation/affiliated_match_helper.cc
@@ -207,7 +207,7 @@
// Inject branding information into the form (e.g. the Play Store name and
// icon URL). We expect to always find a matching facet URI in the results.
- auto facet = base::ranges::find(results, facet_uri, &Facet::uri);
+ auto facet = std::ranges::find(results, facet_uri, &Facet::uri);
CHECK(facet != results.end(), base::NotFatalUntil::M130);
form->app_display_name = facet->branding_info.name;
@@ -217,7 +217,7 @@
// multiple web realms are available, this will always choose the first
// available web realm for injection.
auto affiliated_facet =
- base::ranges::find_if(results, [](const Facet& affiliated_facet) {
+ std::ranges::find_if(results, [](const Facet& affiliated_facet) {
return affiliated_facet.uri.IsValidWebFacetURI();
});
if (affiliated_facet != results.end()) {
diff --git a/components/password_manager/core/browser/credential_manager_impl_unittest.cc b/components/password_manager/core/browser/credential_manager_impl_unittest.cc
index b8a600e..9d9dc43 100644
--- a/components/password_manager/core/browser/credential_manager_impl_unittest.cc
+++ b/components/password_manager/core/browser/credential_manager_impl_unittest.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <algorithm>
#include <map>
#include <memory>
#include <string>
@@ -15,7 +16,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/gmock_move_support.h"
diff --git a/components/password_manager/core/browser/credential_manager_pending_request_task.cc b/components/password_manager/core/browser/credential_manager_pending_request_task.cc
index 0fc1c7fe..de9935c 100644
--- a/components/password_manager/core/browser/credential_manager_pending_request_task.cc
+++ b/components/password_manager/core/browser/credential_manager_pending_request_task.cc
@@ -17,12 +17,11 @@
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/user_metrics.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "build/buildflag.h"
#include "components/affiliations/core/browser/affiliation_utils.h"
-#include "components/password_manager/core/browser/credential_type_flags.h"
#include "components/password_manager/core/browser/credential_manager_utils.h"
+#include "components/password_manager/core/browser/credential_type_flags.h"
#include "components/password_manager/core/browser/form_fetcher_impl.h"
#include "components/password_manager/core/browser/password_bubble_experiment.h"
#include "components/password_manager/core/browser/password_form.h"
@@ -168,18 +167,18 @@
void CredentialManagerPendingRequestTask::OnFetchCompleted() {
std::vector<std::unique_ptr<PasswordForm>> all_matches;
- base::ranges::transform(form_fetcher_->GetFederatedMatches(),
- std::back_inserter(all_matches),
- [](const PasswordForm& form) {
- return std::make_unique<PasswordForm>(form);
- });
+ std::ranges::transform(form_fetcher_->GetFederatedMatches(),
+ std::back_inserter(all_matches),
+ [](const PasswordForm& form) {
+ return std::make_unique<PasswordForm>(form);
+ });
// GetFederatedMatches() comes with duplicates, filter them immediately.
FilterDuplicatesInFederatedCredentials(all_matches);
- base::ranges::transform(form_fetcher_->GetBestMatches(),
- std::back_inserter(all_matches),
- [](const PasswordForm& form) {
- return std::make_unique<PasswordForm>(form);
- });
+ std::ranges::transform(form_fetcher_->GetBestMatches(),
+ std::back_inserter(all_matches),
+ [](const PasswordForm& form) {
+ return std::make_unique<PasswordForm>(form);
+ });
bool include_passwords =
requested_credential_type_flags_ &
static_cast<int>(CredentialTypeFlags::kPassword);
diff --git a/components/password_manager/core/browser/fake_form_fetcher.cc b/components/password_manager/core/browser/fake_form_fetcher.cc
index c7b6c79..1355d76 100644
--- a/components/password_manager/core/browser/fake_form_fetcher.cc
+++ b/components/password_manager/core/browser/fake_form_fetcher.cc
@@ -110,7 +110,7 @@
void FakeFormFetcher::SetNonFederated(
const std::vector<PasswordForm>& non_federated) {
- CHECK(base::ranges::all_of(
+ CHECK(std::ranges::all_of(
non_federated, [this](auto& form) { return form.scheme == scheme_; }));
SetNonFederated(non_federated, non_federated);
}
diff --git a/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc b/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc
index f751fb04..5bedafb2 100644
--- a/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc
+++ b/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc
@@ -7,7 +7,6 @@
#include "base/containers/flat_set.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/values.h"
#include "components/password_manager/core/browser/features/password_features.h"
#include "components/password_manager/core/browser/features/password_manager_features_util.h"
diff --git a/components/password_manager/core/browser/field_info_manager.cc b/components/password_manager/core/browser/field_info_manager.cc
index a7cd9ea..1178297 100644
--- a/components/password_manager/core/browser/field_info_manager.cc
+++ b/components/password_manager/core/browser/field_info_manager.cc
@@ -24,7 +24,7 @@
bool StoresPredictionsForInfo(const FormPredictions& predictions,
FieldInfo& field_info) {
FieldRendererId field_id = field_info.field_id;
- auto field = base::ranges::find_if(
+ auto field = std::ranges::find_if(
predictions.fields, [field_id](const PasswordFieldPrediction& field) {
return field.renderer_id == field_id;
});
diff --git a/components/password_manager/core/browser/form_parsing/form_data_parser.cc b/components/password_manager/core/browser/form_parsing/form_data_parser.cc
index bb830cbc..c245617 100644
--- a/components/password_manager/core/browser/form_parsing/form_data_parser.cc
+++ b/components/password_manager/core/browser/form_parsing/form_data_parser.cc
@@ -22,7 +22,6 @@
#include "base/memory/raw_ptr_exclusion.h"
#include "base/metrics/histogram_functions.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "build/build_config.h"
#include "components/autofill/core/browser/field_types.h"
@@ -185,7 +184,7 @@
}
bool DoesStringContainOnlyDigits(const std::u16string& s) {
- return base::ranges::all_of(s, &base::IsAsciiDigit<char16_t>);
+ return std::ranges::all_of(s, &base::IsAsciiDigit<char16_t>);
}
// Heuristics to determine that a string is very unlikely to be a username.
@@ -379,8 +378,8 @@
const FormFieldData* FindConfirmationPasswordField(
const std::vector<ProcessedField>& processed_fields,
const FormFieldData& new_password) {
- auto new_password_field = base::ranges::find(processed_fields, &new_password,
- &ProcessedField::field);
+ auto new_password_field = std::ranges::find(processed_fields, &new_password,
+ &ProcessedField::field);
if (new_password_field == processed_fields.end()) {
return nullptr;
}
@@ -403,10 +402,9 @@
bool HasPasswordFieldsWithUserInput(
const std::vector<ProcessedField>& processed_fields) {
- return base::ranges::any_of(
- processed_fields, [](const ProcessedField& field) {
- return field.is_password && !field.field->user_input().empty();
- });
+ return std::ranges::any_of(processed_fields, [](const ProcessedField& field) {
+ return field.is_password && !field.field->user_input().empty();
+ });
}
// Tries to parse |processed_fields| based on server |predictions|. Uses |mode|
@@ -699,7 +697,7 @@
// |passwords| though, in case it is needed for fallback.
std::vector<const ProcessedField*> filtered;
filtered.reserve(passwords.size());
- base::ranges::copy_if(
+ std::ranges::copy_if(
passwords, std::back_inserter(filtered),
[&ignored_readonly](const ProcessedField* processed_field) {
return IsLikelyPassword(*processed_field, &ignored_readonly);
@@ -1438,7 +1436,7 @@
const std::vector<ProcessedField>& processed_fields,
Interactability username_max) {
for (FieldRendererId predicted_id : username_predictions) {
- auto iter = base::ranges::find_if(
+ auto iter = std::ranges::find_if(
processed_fields, [&](const ProcessedField& processed_field) {
return processed_field.field->renderer_id() == predicted_id &&
MatchesInteractability(processed_field, username_max);
diff --git a/components/password_manager/core/browser/form_parsing/form_data_parser_unittest.cc b/components/password_manager/core/browser/form_parsing/form_data_parser_unittest.cc
index aa477e66..307cad4 100644
--- a/components/password_manager/core/browser/form_parsing/form_data_parser_unittest.cc
+++ b/components/password_manager/core/browser/form_parsing/form_data_parser_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <optional>
#include <set>
#include <string>
@@ -13,7 +14,6 @@
#include <utility>
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
@@ -193,7 +193,7 @@
}
auto field_it =
- base::ranges::find(fields, renderer_id, &FormFieldData::renderer_id);
+ std::ranges::find(fields, renderer_id, &FormFieldData::renderer_id);
ASSERT_TRUE(field_it != fields.end())
<< "Could not find a field with renderer ID " << renderer_id;
diff --git a/components/password_manager/core/browser/generation/password_generator.cc b/components/password_manager/core/browser/generation/password_generator.cc
index 00f3700..c2ad3b9 100644
--- a/components/password_manager/core/browser/generation/password_generator.cc
+++ b/components/password_manager/core/browser/generation/password_generator.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/generation/password_generator.h"
+#include <algorithm>
#include <limits>
#include <map>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/check.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/proto/password_requirements.pb.h"
#include "components/password_manager/core/browser/features/password_features.h"
@@ -85,7 +85,7 @@
// sequences of '-' or '_' that are joined into long strokes on the screen
// in many fonts.
bool IsDifficultToRead(const std::u16string& password) {
- return base::ranges::adjacent_find(password, [](auto a, auto b) {
+ return std::ranges::adjacent_find(password, [](auto a, auto b) {
return a == b && (a == '-' || a == '_');
}) != password.end();
}
diff --git a/components/password_manager/core/browser/generation/password_generator_unittest.cc b/components/password_manager/core/browser/generation/password_generator_unittest.cc
index 2c11f78f..a1a28ad 100644
--- a/components/password_manager/core/browser/generation/password_generator_unittest.cc
+++ b/components/password_manager/core/browser/generation/password_generator_unittest.cc
@@ -4,11 +4,11 @@
#include "components/password_manager/core/browser/generation/password_generator.h"
+#include <algorithm>
#include <cstdint>
#include <string>
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/test/scoped_feature_list.h"
#include "components/autofill/core/browser/proto/password_requirements.pb.h"
#include "components/password_manager/core/browser/features/password_features.h"
@@ -48,7 +48,7 @@
size_t CountCharsInClass(const std::u16string& password,
const std::string& class_name) {
- return base::ranges::count_if(password, [&class_name](char16_t c) {
+ return std::ranges::count_if(password, [&class_name](char16_t c) {
return IsCharInClass(c, class_name);
});
}
diff --git a/components/password_manager/core/browser/http_password_store_migrator_unittest.cc b/components/password_manager/core/browser/http_password_store_migrator_unittest.cc
index 848a1f91..f359475 100644
--- a/components/password_manager/core/browser/http_password_store_migrator_unittest.cc
+++ b/components/password_manager/core/browser/http_password_store_migrator_unittest.cc
@@ -4,9 +4,9 @@
#include "components/password_manager/core/browser/http_password_store_migrator.h"
+#include <algorithm>
#include <memory>
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/task_environment.h"
#include "components/password_manager/core/browser/password_form.h"
diff --git a/components/password_manager/core/browser/import/password_importer.cc b/components/password_manager/core/browser/import/password_importer.cc
index 8e1f8caf..8f38e10 100644
--- a/components/password_manager/core/browser/import/password_importer.cc
+++ b/components/password_manager/core/browser/import/password_importer.cc
@@ -199,7 +199,7 @@
// Check if `local_credential` has matching `signon_realm`, but different
// `password`.
if (local_credential.password != imported_credential.password &&
- base::ranges::any_of(
+ std::ranges::any_of(
local_credential.facets,
[&imported_credential](const CredentialFacet& facet) {
return facet.signon_realm ==
@@ -220,7 +220,7 @@
// forms with different `signon_realm`.
CHECK(presenter);
std::vector<PasswordForm> results;
- base::ranges::copy_if(
+ std::ranges::copy_if(
presenter->GetCorrespondingPasswordForms(credential),
std::back_inserter(results), [&](const PasswordForm& form) {
return form.signon_realm == credential.GetFirstSignonRealm() &&
diff --git a/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc b/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
index 3c1eb5b..30182f5 100644
--- a/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
+++ b/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
@@ -4,11 +4,11 @@
#include "components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.h"
+#include <algorithm>
#include <optional>
#include <utility>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/thread_pool.h"
#include "components/password_manager/core/browser/leak_detection/encryption_utils.h"
@@ -25,7 +25,7 @@
using HolderPtr = std::unique_ptr<BulkLeakCheckImpl::CredentialHolder>;
HolderPtr RemoveFromQueue(BulkLeakCheckImpl::CredentialHolder* weak_holder,
base::circular_deque<HolderPtr>* queue) {
- auto it = base::ranges::find(*queue, weak_holder, &HolderPtr::get);
+ auto it = std::ranges::find(*queue, weak_holder, &HolderPtr::get);
CHECK(it != queue->end());
HolderPtr holder = std::move(*it);
queue->erase(it);
diff --git a/components/password_manager/core/browser/leak_detection/bulk_leak_check_service_unittest.cc b/components/password_manager/core/browser/leak_detection/bulk_leak_check_service_unittest.cc
index d020840..74ca811b 100644
--- a/components/password_manager/core/browser/leak_detection/bulk_leak_check_service_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection/bulk_leak_check_service_unittest.cc
@@ -4,8 +4,9 @@
#include "components/password_manager/core/browser/leak_detection/bulk_leak_check_service.h"
+#include <algorithm>
+
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
@@ -34,11 +35,11 @@
constexpr char16_t kPassword[] = u"password123";
MATCHER_P(CredentialsAre, credentials, "") {
- return base::ranges::equal(arg, credentials.get(),
- [](const auto& lhs, const auto& rhs) {
- return lhs.username() == rhs.username() &&
- lhs.password() == rhs.password();
- });
+ return std::ranges::equal(arg, credentials.get(),
+ [](const auto& lhs, const auto& rhs) {
+ return lhs.username() == rhs.username() &&
+ lhs.password() == rhs.password();
+ });
;
}
diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc
index 9e785a3..f14db1c 100644
--- a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc
+++ b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc
@@ -4,13 +4,13 @@
#include "components/password_manager/core/browser/leak_detection/leak_detection_request_utils.h"
+#include <algorithm>
#include <optional>
#include <string>
#include <string_view>
#include "base/containers/span.h"
#include "base/debug/dump_without_crashing.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/thread_pool.h"
@@ -112,7 +112,7 @@
std::string hash_username_password =
crypto::SHA256HashString(*decrypted_username_password);
- const ptrdiff_t matched_prefixes = base::ranges::count_if(
+ const ptrdiff_t matched_prefixes = std::ranges::count_if(
response->encrypted_leak_match_prefixes,
[&hash_username_password](const std::string& prefix) {
return base::StartsWith(hash_username_password, prefix,
diff --git a/components/password_manager/core/browser/leak_detection_delegate_helper.cc b/components/password_manager/core/browser/leak_detection_delegate_helper.cc
index ae32a88..2398ff3a 100644
--- a/components/password_manager/core/browser/leak_detection_delegate_helper.cc
+++ b/components/password_manager/core/browser/leak_detection_delegate_helper.cc
@@ -4,10 +4,11 @@
#include "components/password_manager/core/browser/leak_detection_delegate_helper.h"
+#include <algorithm>
+
#include "base/barrier_closure.h"
#include "base/containers/flat_set.h"
#include "base/functional/callback.h"
-#include "base/ranges/algorithm.h"
#include "components/password_manager/core/browser/leak_detection/encryption_utils.h"
#include "components/password_manager/core/browser/password_form.h"
#include "components/password_manager/core/browser/password_store/password_store_interface.h"
@@ -51,7 +52,7 @@
void LeakDetectionDelegateHelper::OnGetPasswordStoreResults(
std::vector<std::unique_ptr<PasswordForm>> results) {
// Store the results.
- base::ranges::move(results, std::back_inserter(partial_results_));
+ std::ranges::move(results, std::back_inserter(partial_results_));
barrier_closure_.Run();
}
@@ -92,7 +93,7 @@
// Check if the password is reused on a different origin, or on the same
// origin with a different username.
- IsReused is_reused(base::ranges::any_of(
+ IsReused is_reused(std::ranges::any_of(
partial_results_, [this, are_urls_equivalent](const auto& form) {
return form->password_value == password_ &&
(!are_urls_equivalent(form->url, url_) ||
diff --git a/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc b/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc
index 3f8d7bb..e22692b 100644
--- a/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc
@@ -4,8 +4,9 @@
#include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
+#include <algorithm>
+
#include "base/i18n/message_formatter.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
@@ -135,16 +136,16 @@
public:
static std::vector<LeakTypeParams> GetTestCases() {
std::vector<LeakTypeParams> test_cases;
- base::ranges::copy(kLeakTypesTestCases, std::back_inserter(test_cases));
+ std::ranges::copy(kLeakTypesTestCases, std::back_inserter(test_cases));
#if BUILDFLAG(IS_ANDROID)
if (base::android::BuildInfo::GetInstance()->is_automotive()) {
- base::ranges::copy(kPasswordCheckLeakTypesTestCasesAndroidAutomotive,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordCheckLeakTypesTestCasesAndroidAutomotive,
+ std::back_inserter(test_cases));
return test_cases;
}
#endif
- base::ranges::copy(kPasswordCheckLeakTypesTestCases,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordCheckLeakTypesTestCases,
+ std::back_inserter(test_cases));
return test_cases;
}
};
@@ -201,16 +202,16 @@
public:
static std::vector<BulkCheckParams> GetTestCases() {
std::vector<BulkCheckParams> test_cases;
- base::ranges::copy(kBulkCheckTestCases, std::back_inserter(test_cases));
+ std::ranges::copy(kBulkCheckTestCases, std::back_inserter(test_cases));
#if BUILDFLAG(IS_ANDROID)
if (base::android::BuildInfo::GetInstance()->is_automotive()) {
- base::ranges::copy(kPasswordCheckBulkCheckTestCasesAndroidAutomotive,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordCheckBulkCheckTestCasesAndroidAutomotive,
+ std::back_inserter(test_cases));
return test_cases;
}
#endif
- base::ranges::copy(kPasswordCheckBulkCheckTestCases,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordCheckBulkCheckTestCases,
+ std::back_inserter(test_cases));
return test_cases;
}
};
@@ -278,17 +279,16 @@
static std::vector<PasswordChangeParams> GetTestCases() {
std::vector<PasswordChangeParams> test_cases;
- base::ranges::copy(kPasswordChangeTestCases,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordChangeTestCases, std::back_inserter(test_cases));
if (base::android::BuildInfo::GetInstance()->is_automotive()) {
- base::ranges::copy(kPasswordChangeTestCasesAuto,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordChangeTestCasesAuto,
+ std::back_inserter(test_cases));
return test_cases;
}
- base::ranges::copy(kPasswordChangeTestCasesNonAuto,
- std::back_inserter(test_cases));
+ std::ranges::copy(kPasswordChangeTestCasesNonAuto,
+ std::back_inserter(test_cases));
return test_cases;
}
};
diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc
index 71a0783..2fb7056a 100644
--- a/components/password_manager/core/browser/password_autofill_manager.cc
+++ b/components/password_manager/core/browser/password_autofill_manager.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -19,7 +20,6 @@
#include "base/memory/weak_ptr.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -81,7 +81,7 @@
bool ContainsOtherThanManagePasswords(
base::span<const Suggestion> suggestions) {
- return base::ranges::any_of(suggestions, [](const auto& s) {
+ return std::ranges::any_of(suggestions, [](const auto& s) {
return s.type != autofill::SuggestionType::kAllSavedPasswordsEntry;
});
}
@@ -104,14 +104,14 @@
suggestion.acceptability = kUnacceptableWithDeactivatedStyle;
}
};
- base::ranges::for_each(current_suggestions, modifier_fun);
+ std::ranges::for_each(current_suggestions, modifier_fun);
return current_suggestions;
}
bool AreNewSuggestionsTheSame(
const std::vector<autofill::Suggestion>& new_suggestions,
const std::vector<autofill::Suggestion>& old_suggestions) {
- return base::ranges::equal(
+ return std::ranges::equal(
new_suggestions, old_suggestions, [](const auto& lhs, const auto& rhs) {
return lhs.main_text == rhs.main_text && lhs.type == rhs.type &&
lhs.icon == rhs.icon && lhs.payload == rhs.payload;
@@ -469,10 +469,10 @@
metrics_util::LogFilledPasswordFromAndroidApp(is_android_credential);
// Emit UMA if grouped affiliation match was available for the user.
if (fill_data_->preferred_login.is_grouped_affiliation ||
- base::ranges::find_if(fill_data_->additional_logins,
- [](const autofill::PasswordAndMetadata& login) {
- return login.is_grouped_affiliation;
- }) != fill_data_->additional_logins.end()) {
+ std::ranges::find_if(fill_data_->additional_logins,
+ [](const autofill::PasswordAndMetadata& login) {
+ return login.is_grouped_affiliation;
+ }) != fill_data_->additional_logins.end()) {
metrics_util::LogFillSuggestionGroupedMatchAccepted(
password_and_metadata.is_grouped_affiliation);
}
@@ -523,7 +523,7 @@
}
// Scan additional logins for a match.
- auto iter = base::ranges::find_if(
+ auto iter = std::ranges::find_if(
fill_data_->additional_logins,
[&](const autofill::PasswordAndMetadata& login) {
return current_username == login.username_value &&
diff --git a/components/password_manager/core/browser/password_credential_filler_impl_unittest.cc b/components/password_manager/core/browser/password_credential_filler_impl_unittest.cc
index f3d3d6d9..ec2ed43 100644
--- a/components/password_manager/core/browser/password_credential_filler_impl_unittest.cc
+++ b/components/password_manager/core/browser/password_credential_filler_impl_unittest.cc
@@ -4,9 +4,10 @@
#include "components/password_manager/core/browser/password_credential_filler_impl.h"
+#include <algorithm>
+
#include "base/functional/callback_forward.h"
#include "base/functional/callback_helpers.h"
-#include "base/ranges/algorithm.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/mock_callback.h"
#include "base/test/scoped_feature_list.h"
@@ -61,7 +62,7 @@
const std::vector<FormFieldFocusabilityType>& focusability_vector,
bool has_captcha) {
std::vector<FormFieldData> fields;
- base::ranges::transform(
+ std::ranges::transform(
focusability_vector, std::back_inserter(fields),
[](FormFieldFocusabilityType type) {
FormFieldData field;
diff --git a/components/password_manager/core/browser/password_form.cc b/components/password_manager/core/browser/password_form.cc
index 8f26df8f..272adf7 100644
--- a/components/password_manager/core/browser/password_form.cc
+++ b/components/password_manager/core/browser/password_form.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_form.h"
+#include <algorithm>
#include <ostream>
#include <sstream>
#include <string>
@@ -11,7 +12,6 @@
#include "base/json/json_writer.h"
#include "base/json/values_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -115,7 +115,7 @@
std::u16string AlternativeElementVectorToString(
const AlternativeElementVector& value_element_pairs) {
std::vector<std::u16string> pairs(value_element_pairs.size());
- base::ranges::transform(
+ std::ranges::transform(
value_element_pairs, pairs.begin(),
[](const AlternativeElement& p) { return p.value + u"+" + p.name; });
return base::JoinString(pairs, u", ");
@@ -389,14 +389,14 @@
}
std::u16string PasswordForm::GetNoteWithEmptyUniqueDisplayName() const {
- const auto& note_itr = base::ranges::find_if(
+ const auto& note_itr = std::ranges::find_if(
notes, &std::u16string::empty, &PasswordNote::unique_display_name);
return note_itr != notes.end() ? note_itr->value : std::u16string();
}
void PasswordForm::SetNoteWithEmptyUniqueDisplayName(
const std::u16string& new_note_value) {
- const auto& note_itr = base::ranges::find_if(
+ const auto& note_itr = std::ranges::find_if(
notes, &std::u16string::empty, &PasswordNote::unique_display_name);
// if the old note doesn't exist, the note is just created.
if (note_itr == notes.end()) {
diff --git a/components/password_manager/core/browser/password_form_cache_impl.cc b/components/password_manager/core/browser/password_form_cache_impl.cc
index fd52de3c..4a77249 100644
--- a/components/password_manager/core/browser/password_form_cache_impl.cc
+++ b/components/password_manager/core/browser/password_form_cache_impl.cc
@@ -60,7 +60,7 @@
void PasswordFormCacheImpl::ResetSubmittedManager() {
auto submitted_manager =
- base::ranges::find_if(form_managers_, &PasswordFormManager::is_submitted);
+ std::ranges::find_if(form_managers_, &PasswordFormManager::is_submitted);
if (submitted_manager != form_managers_.end()) {
form_managers_.erase(submitted_manager);
}
diff --git a/components/password_manager/core/browser/password_form_filling_unittest.cc b/components/password_manager/core/browser/password_form_filling_unittest.cc
index e0f8e58..4bfbc81 100644
--- a/components/password_manager/core/browser/password_form_filling_unittest.cc
+++ b/components/password_manager/core/browser/password_form_filling_unittest.cc
@@ -4,13 +4,13 @@
#include "components/password_manager/core/browser/password_form_filling.h"
+#include <algorithm>
#include <map>
#include <string>
#include <vector>
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
@@ -91,8 +91,8 @@
PasswordFormFillData::LoginCollection::const_iterator FindPasswordByUsername(
const std::vector<autofill::PasswordAndMetadata>& logins,
const std::u16string& username) {
- return base::ranges::find(logins, username,
- &autofill::PasswordAndMetadata::username_value);
+ return std::ranges::find(logins, username,
+ &autofill::PasswordAndMetadata::username_value);
}
} // namespace
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
index e56c8c0..c3a70f66 100644
--- a/components/password_manager/core/browser/password_form_manager.cc
+++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_form_manager.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include <set>
@@ -21,7 +22,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "components/affiliations/core/browser/affiliation_utils.h"
@@ -101,8 +101,8 @@
[&element](const std::u16string& name) {
return base::EqualsCaseInsensitiveASCII(name, element);
};
- return base::ranges::any_of(form.fields(), equals_element_case_insensitive,
- &FormFieldData::name);
+ return std::ranges::any_of(form.fields(), equals_element_case_insensitive,
+ &FormFieldData::name);
}
void LogUsingPossibleUsername(PasswordManagerClient* client,
@@ -324,7 +324,7 @@
return false;
}
CHECK(observed_form());
- return base::ranges::any_of(
+ return std::ranges::any_of(
observed_form()->fields(),
[field_renderer_id](const autofill::FormFieldData& field) {
return field.renderer_id() == field_renderer_id;
@@ -435,7 +435,7 @@
return !match.IsUsingAccountStore() && match.username_value == username &&
match.password_value == password;
};
- return base::ranges::any_of(form_fetcher_->GetBestMatches(), is_movable) &&
+ return std::ranges::any_of(form_fetcher_->GetBestMatches(), is_movable) &&
!form_fetcher_->IsMovingBlocked(GaiaIdHash::FromGaiaId(gaia_id),
username);
}
@@ -470,8 +470,8 @@
auto same_username_in_account_store = [&](const PasswordForm& match) {
return match.IsUsingAccountStore() && match.username_value == username;
};
- return base::ranges::any_of(form_fetcher_->GetBestMatches(),
- same_username_in_account_store) &&
+ return std::ranges::any_of(form_fetcher_->GetBestMatches(),
+ same_username_in_account_store) &&
!form_fetcher_->IsMovingBlocked(GaiaIdHash::FromGaiaId(gaia_id),
username);
}
@@ -494,7 +494,7 @@
// it is a known username.
const auto& alternative_usernames =
parsed_submitted_form_->all_alternative_usernames;
- auto alternative_username_it = base::ranges::find(
+ auto alternative_username_it = std::ranges::find(
alternative_usernames, new_username, &AlternativeElement::value);
if (alternative_username_it != alternative_usernames.end()) {
@@ -531,7 +531,7 @@
const AlternativeElementVector& alternative_passwords =
parsed_submitted_form_->all_alternative_passwords;
- auto alternative_password_it = base::ranges::find(
+ auto alternative_password_it = std::ranges::find(
alternative_passwords, new_password, &AlternativeElement::value);
if (alternative_password_it != alternative_passwords.end()) {
parsed_submitted_form_->password_element = alternative_password_it->name;
@@ -712,7 +712,7 @@
// Update the observed field value.
std::vector<FormFieldData> fields = mutable_observed_form()->ExtractFields();
auto modified_field =
- base::ranges::find_if(fields, [&field_id](const FormFieldData& field) {
+ std::ranges::find_if(fields, [&field_id](const FormFieldData& field) {
return field.renderer_id() == field_id;
});
if (modified_field == fields.end()) {
@@ -784,14 +784,14 @@
};
bool has_removed_passwords =
- base::ranges::any_of(observed_form()->fields(), is_removed_password);
+ std::ranges::any_of(observed_form()->fields(), is_removed_password);
if (!has_removed_passwords) {
return false;
}
// The formless form can be considered submitted if all removed password
// fields had input and there was at least one removed password field.
- return base::ranges::all_of(
+ return std::ranges::all_of(
observed_form()->fields(), [&](const FormFieldData& field_data) {
return !is_removed_password(field_data) ||
field_data_manager.HasFieldData(field_data.renderer_id());
@@ -1224,8 +1224,8 @@
// Find the generating element to update its value. The parser needs a non
// empty value.
std::vector<FormFieldData> fields = form_data.ExtractFields();
- auto it = base::ranges::find(fields, generation_element_id,
- &FormFieldData::renderer_id);
+ auto it = std::ranges::find(fields, generation_element_id,
+ &FormFieldData::renderer_id);
// The parameters are coming from the renderer and can't be trusted.
if (it == fields.end()) {
return;
@@ -1542,7 +1542,7 @@
CredentialFieldType::kNone) {
continue;
}
- auto matched_iterator = base::ranges::find_if(
+ auto matched_iterator = std::ranges::find_if(
observed_form()->fields(),
[&field_prediction](const autofill::FormFieldData& field) {
return field_prediction.renderer_id == field.renderer_id();
diff --git a/components/password_manager/core/browser/password_form_metrics_recorder.cc b/components/password_manager/core/browser/password_form_metrics_recorder.cc
index bbe255f..778b1c4d 100644
--- a/components/password_manager/core/browser/password_form_metrics_recorder.cc
+++ b/components/password_manager/core/browser/password_form_metrics_recorder.cc
@@ -237,7 +237,7 @@
const FormFieldData* FindFieldByRendererId(const FormData& form,
autofill::FieldRendererId field_id) {
auto field =
- base::ranges::find(form.fields(), field_id, &FormFieldData::renderer_id);
+ std::ranges::find(form.fields(), field_id, &FormFieldData::renderer_id);
return field == form.fields().end() ? nullptr : &*field;
}
@@ -248,7 +248,7 @@
const std::u16string& field_value) {
// If the submitted field contains one of the previously saved
// values, the classification was most likely correct.
- if (base::ranges::find(saved_values, field_value) != saved_values.end()) {
+ if (std::ranges::find(saved_values, field_value) != saved_values.end()) {
return PasswordFormMetricsRecorder::ClassificationCorrectness::kCorrect;
}
@@ -256,7 +256,7 @@
// values, the classification was wrong.
for (const auto& field : submitted_form.fields()) {
if (!field.value().empty() &&
- (base::ranges::find(saved_values, field.value()) !=
+ (std::ranges::find(saved_values, field.value()) !=
saved_values.end())) {
return PasswordFormMetricsRecorder::ClassificationCorrectness::kWrong;
}
@@ -704,7 +704,7 @@
}
base::UmaHistogramBoolean(
"PasswordManager.FillSuggestionsHasGroupedMatch",
- base::ranges::find_if(best_matches, [](const PasswordForm& match) {
+ std::ranges::find_if(best_matches, [](const PasswordForm& match) {
return password_manager_util::GetMatchType(match) ==
password_manager_util::GetLoginMatchType::kGrouped;
}) != best_matches.end());
@@ -928,9 +928,9 @@
if (new_pwd_field && !new_pwd_field->value().empty()) {
ClassificationCorrectness new_pwd_correctness =
ClassificationCorrectness::kUnknown;
- if ((base::ranges::find(saved_passwords, new_pwd_field->value()) !=
+ if ((std::ranges::find(saved_passwords, new_pwd_field->value()) !=
saved_passwords.end()) ||
- (base::ranges::find(saved_usernames, new_pwd_field->value()) !=
+ (std::ranges::find(saved_usernames, new_pwd_field->value()) !=
saved_usernames.end())) {
// If a previously saved value was submitted, it's not a new password.
new_pwd_correctness = ClassificationCorrectness::kWrong;
diff --git a/components/password_manager/core/browser/password_generation_manager.cc b/components/password_manager/core/browser/password_generation_manager.cc
index b6ff523..09561cf 100644
--- a/components/password_manager/core/browser/password_generation_manager.cc
+++ b/components/password_manager/core/browser/password_generation_manager.cc
@@ -4,13 +4,13 @@
#include "components/password_manager/core/browser/password_generation_manager.h"
+#include <algorithm>
#include <map>
#include <unordered_set>
#include <utility>
#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "components/password_manager/core/browser/form_saver.h"
#include "components/password_manager/core/browser/password_feature_manager.h"
#include "components/password_manager/core/browser/password_form.h"
@@ -216,8 +216,8 @@
const std::u16string& password,
const base::FunctionRef<bool(char16_t)>& belongs_to_character_class) {
std::unordered_set<char16_t> result;
- base::ranges::copy_if(password, std::inserter(result, result.begin()),
- belongs_to_character_class);
+ std::ranges::copy_if(password, std::inserter(result, result.begin()),
+ belongs_to_character_class);
return result;
}
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index 1d91a864..49857e72 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -18,7 +18,6 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -167,7 +166,7 @@
}
bool HasSingleUsernameVote(const FormPredictions& form) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
form.fields,
[](const auto& type) {
return password_manager_util::IsSingleUsernameType(type);
@@ -182,8 +181,8 @@
return type == ACCOUNT_CREATION_PASSWORD || type == NEW_PASSWORD;
};
- return base::ranges::any_of(form.fields, is_creation_password_or_new_password,
- &PasswordFieldPrediction::type);
+ return std::ranges::any_of(form.fields, is_creation_password_or_new_password,
+ &PasswordFieldPrediction::type);
}
// Returns true iff `form` is not recognized as a password form by the renderer,
@@ -209,7 +208,7 @@
bool HasMutedCredentials(base::span<const PasswordForm> credentials,
const std::u16string& username) {
- return base::ranges::any_of(credentials, [&username](const auto& credential) {
+ return std::ranges::any_of(credentials, [&username](const auto& credential) {
return credential.username_value == username &&
(IsMutedInsecureCredential(credential, InsecureType::kLeaked) ||
IsMutedInsecureCredential(credential, InsecureType::kPhished));
@@ -261,7 +260,7 @@
bool ModelPredictionsContainCredentialTypes(
const base::flat_map<FieldRendererId, FieldType>& predictions) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
predictions,
[](const std::pair<FieldRendererId, FieldType>& field_prediction) {
autofill::FieldTypeGroup type_category =
@@ -345,7 +344,7 @@
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
bool HasManuallyFilledFields(const PasswordForm& form) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
form.form_data.fields(), [&](const autofill::FormFieldData& field) {
return field.properties_mask() &
autofill::FieldPropertiesFlags::kAutofilledOnUserTrigger;
@@ -643,10 +642,10 @@
}
// Remove the duplicates.
- base::ranges::sort(fetchers);
+ std::ranges::sort(fetchers);
auto repeated_fetchers = std::ranges::unique(fetchers);
fetchers.erase(repeated_fetchers.begin(), repeated_fetchers.end());
- base::ranges::sort(drivers);
+ std::ranges::sort(drivers);
auto repeated_drivers = std::ranges::unique(drivers);
drivers.erase(repeated_drivers.begin(), repeated_drivers.end());
// Refetch credentials for all the forms and update the drivers.
@@ -776,8 +775,8 @@
// verified that fields are relevant.
FieldRendererId new_password_field_id =
manager->GetSubmittedForm()->new_password_element_renderer_id;
- auto it = base::ranges::find(form_data.fields(), new_password_field_id,
- &autofill::FormFieldData::renderer_id);
+ auto it = std::ranges::find(form_data.fields(), new_password_field_id,
+ &autofill::FormFieldData::renderer_id);
if (it != form_data.fields().end() && it->value().empty()) {
manager->UpdateSubmissionIndicatorEvent(
SubmissionIndicatorEvent::CHANGE_PASSWORD_FORM_CLEARED);
@@ -1095,8 +1094,8 @@
}
// Get the field that corresponds to `field_id`.
- auto it = base::ranges::find(observed_form->fields(), field_id,
- &autofill::FormFieldData::renderer_id);
+ auto it = std::ranges::find(observed_form->fields(), field_id,
+ &autofill::FormFieldData::renderer_id);
if (it == observed_form->fields().end()) {
return;
}
@@ -1164,7 +1163,7 @@
auto* submitted_manager = GetSubmittedManager();
if (submitted_manager) {
// Check if the submitted manager corresponds to one of the removed forms.
- bool removed_submitted_form = base::ranges::any_of(
+ bool removed_submitted_form = std::ranges::any_of(
removed_forms_copy, [&](const auto& removed_form_id) {
return submitted_manager->DoesManage(removed_form_id, driver);
});
@@ -1180,11 +1179,10 @@
// have data that we can save.
// If the submitted manager observes one of the removed forms, just
// ignore it as it was already inspected above.
- if (base::ranges::any_of(
- removed_forms_copy, [&](const auto& removed_form_id) {
- auto* manager = GetMatchedManagerForForm(driver, removed_form_id);
- return manager != submitted_manager && detect_submission(manager);
- })) {
+ if (std::ranges::any_of(removed_forms_copy, [&](const auto& removed_form_id) {
+ auto* manager = GetMatchedManagerForForm(driver, removed_form_id);
+ return manager != submitted_manager && detect_submission(manager);
+ })) {
return;
}
}
@@ -1763,7 +1761,7 @@
bool PasswordManager::NewFormsParsed(PasswordManagerDriver* driver,
const std::vector<FormData>& form_data) {
- return base::ranges::any_of(form_data, [driver, this](const FormData& form) {
+ return std::ranges::any_of(form_data, [driver, this](const FormData& form) {
return !GetMatchedManagerForForm(driver, form.renderer_id());
});
}
diff --git a/components/password_manager/core/browser/password_manager_test_utils.cc b/components/password_manager/core/browser/password_manager_test_utils.cc
index 79cc25a..8eed717 100644
--- a/components/password_manager/core/browser/password_manager_test_utils.cc
+++ b/components/password_manager/core/browser/password_manager_test_utils.cc
@@ -4,13 +4,13 @@
#include "components/password_manager/core/browser/password_manager_test_utils.h"
+#include <algorithm>
#include <memory>
#include <ostream>
#include <string>
#include <utility>
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/affiliations/core/browser/affiliation_utils.h"
diff --git a/components/password_manager/core/browser/password_manager_util.cc b/components/password_manager/core/browser/password_manager_util.cc
index 0c8e9e5c..d07dcb4 100644
--- a/components/password_manager/core/browser/password_manager_util.cc
+++ b/components/password_manager/core/browser/password_manager_util.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_manager_util.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <string_view>
@@ -16,7 +17,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
@@ -195,9 +195,9 @@
}
std::vector<PasswordForm> FindBestMatches(base::span<PasswordForm> matches) {
- CHECK(base::ranges::none_of(matches, &PasswordForm::blocked_by_user));
+ CHECK(std::ranges::none_of(matches, &PasswordForm::blocked_by_user));
- base::ranges::sort(matches, IsBetterMatch, {});
+ std::ranges::sort(matches, IsBetterMatch, {});
std::vector<PasswordForm> best_matches;
@@ -219,7 +219,7 @@
};
// If 2 credential have the same password and the same username, update
// the in_store value in the best matches.
- auto duplicate_match_it = base::ranges::find_if(
+ auto duplicate_match_it = std::ranges::find_if(
best_matches, [&match](const PasswordForm& form) {
return match.username_value == form.username_value &&
match.password_value == form.password_value;
diff --git a/components/password_manager/core/browser/password_manager_util_unittest.cc b/components/password_manager/core/browser/password_manager_util_unittest.cc
index f765bf2..a9e0c644 100644
--- a/components/password_manager/core/browser/password_manager_util_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_util_unittest.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_manager_util.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -12,7 +13,6 @@
#include "base/containers/contains.h"
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
@@ -389,7 +389,7 @@
test_case.expected_best_matches_indices.at(username);
size_t actual_index = std::distance(
matches.begin(),
- base::ranges::find_if(matches, [&match](const auto& non_federated) {
+ std::ranges::find_if(matches, [&match](const auto& non_federated) {
return non_federated == match;
}));
EXPECT_EQ(expected_index, actual_index);
diff --git a/components/password_manager/core/browser/password_manual_fallback_flow.cc b/components/password_manager/core/browser/password_manual_fallback_flow.cc
index 9c0e26d..4a145fe 100644
--- a/components/password_manager/core/browser/password_manual_fallback_flow.cc
+++ b/components/password_manager/core/browser/password_manual_fallback_flow.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_manual_fallback_flow.h"
+#include <algorithm>
#include <optional>
#include "base/check.h"
@@ -11,7 +12,6 @@
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/foundations/autofill_client.h"
#include "components/autofill/core/browser/suggestions/suggestion.h"
@@ -57,7 +57,7 @@
const SavedPasswordsPresenter& presenter) {
const std::vector<CredentialUIEntry>& credential_ui_entries =
presenter.GetSavedCredentials();
- const auto& found_credential_it = base::ranges::find_if(
+ const auto& found_credential_it = std::ranges::find_if(
credential_ui_entries, [&payload](const CredentialUIEntry& ui_entry) {
return ui_entry.username == payload.username &&
ui_entry.password == payload.password &&
@@ -73,7 +73,7 @@
const std::vector<PasswordForm> forms =
presenter.GetCorrespondingPasswordForms(*found_credential_it);
const std::vector<PasswordForm>::const_iterator& found_form_it =
- base::ranges::find_if(forms, [&payload](const PasswordForm& form) {
+ std::ranges::find_if(forms, [&payload](const PasswordForm& form) {
return form.signon_realm == payload.signon_realm;
});
CHECK(found_form_it != forms.end());
diff --git a/components/password_manager/core/browser/password_reuse_detector_impl.cc b/components/password_manager/core/browser/password_reuse_detector_impl.cc
index 91ceeab..7873fbd 100644
--- a/components/password_manager/core/browser/password_reuse_detector_impl.cc
+++ b/components/password_manager/core/browser/password_reuse_detector_impl.cc
@@ -10,7 +10,6 @@
#include <utility>
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "components/password_manager/core/browser/features/password_features.h"
#include "components/password_manager/core/browser/hash_password_manager.h"
#include "components/password_manager/core/browser/password_form.h"
diff --git a/components/password_manager/core/browser/password_reuse_detector_impl_unittest.cc b/components/password_manager/core/browser/password_reuse_detector_impl_unittest.cc
index c7bb34b..b62db18 100644
--- a/components/password_manager/core/browser/password_reuse_detector_impl_unittest.cc
+++ b/components/password_manager/core/browser/password_reuse_detector_impl_unittest.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_reuse_detector_impl.h"
+#include <algorithm>
#include <iterator>
#include <memory>
#include <optional>
@@ -11,7 +12,6 @@
#include <vector>
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
diff --git a/components/password_manager/core/browser/password_save_manager_impl.cc b/components/password_manager/core/browser/password_save_manager_impl.cc
index 4ca68cf3..596929e 100644
--- a/components/password_manager/core/browser/password_save_manager_impl.cc
+++ b/components/password_manager/core/browser/password_save_manager_impl.cc
@@ -14,7 +14,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/user_metrics.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "components/autofill/core/browser/data_quality/validation.h"
@@ -133,8 +132,8 @@
bool AccountStoreMatchesContainForm(
const std::vector<raw_ptr<const PasswordForm, VectorExperimental>>& matches,
const PasswordForm& form) {
- DCHECK(base::ranges::all_of(matches, &PasswordForm::IsUsingAccountStore));
- return base::ranges::any_of(matches, [&form](const PasswordForm* match) {
+ DCHECK(std::ranges::all_of(matches, &PasswordForm::IsUsingAccountStore));
+ return std::ranges::any_of(matches, [&form](const PasswordForm* match) {
return ArePasswordFormUniqueKeysEqual(*match, form) &&
match->password_value == form.password_value;
});
@@ -235,10 +234,10 @@
bool AlternativeElementsContainValue(const AlternativeElementVector& elements,
const std::u16string& value) {
- return base::ranges::any_of(elements,
- [&value](const AlternativeElement& element) {
- return element.value == value;
- });
+ return std::ranges::any_of(elements,
+ [&value](const AlternativeElement& element) {
+ return element.value == value;
+ });
}
void PopulateAlternativeUsernames(base::span<const PasswordForm> best_matches,
@@ -257,8 +256,8 @@
base::span<const PasswordForm> matches) {
std::vector<raw_ptr<const PasswordForm, VectorExperimental>> result(
matches.size());
- base::ranges::transform(matches, result.begin(),
- [](const PasswordForm& form) { return &form; });
+ std::ranges::transform(matches, result.begin(),
+ [](const PasswordForm& form) { return &form; });
return result;
}
diff --git a/components/password_manager/core/browser/password_store/fake_password_store_backend.cc b/components/password_manager/core/browser/password_store/fake_password_store_backend.cc
index e7f2d33..ace05e0 100644
--- a/components/password_manager/core/browser/password_store/fake_password_store_backend.cc
+++ b/components/password_manager/core/browser/password_store/fake_password_store_backend.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/password_store/fake_password_store_backend.h"
+#include <algorithm>
#include <iterator>
#include <optional>
#include <utility>
@@ -12,7 +13,6 @@
#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "components/password_manager/core/browser/affiliation/affiliated_match_helper.h"
#include "components/password_manager/core/browser/password_form.h"
@@ -301,7 +301,7 @@
const PasswordForm& form) {
PasswordStoreChangeList changes;
auto& passwords_for_signon_realm = stored_passwords_[form.signon_realm];
- auto iter = base::ranges::find_if(
+ auto iter = std::ranges::find_if(
passwords_for_signon_realm, [&form](const auto& password) {
return ArePasswordFormUniqueKeysEqual(form, password);
});
@@ -394,7 +394,7 @@
PasswordStoreChangeList list;
for (const auto& form : all_logins) {
if (delete_begin <= form.date_created && form.date_created < delete_end) {
- base::ranges::move(RemoveLoginInternal(form), std::back_inserter(list));
+ std::ranges::move(RemoveLoginInternal(form), std::back_inserter(list));
}
}
return list;
diff --git a/components/password_manager/core/browser/password_store/get_logins_with_affiliations_request_handler.cc b/components/password_manager/core/browser/password_store/get_logins_with_affiliations_request_handler.cc
index d5aedcba..17ae0fdb 100644
--- a/components/password_manager/core/browser/password_store/get_logins_with_affiliations_request_handler.cc
+++ b/components/password_manager/core/browser/password_store/get_logins_with_affiliations_request_handler.cc
@@ -103,7 +103,7 @@
});
// Set "skip_zero_click" on federated credentials.
- base::ranges::for_each(credentials, [](PasswordForm& form) {
+ std::ranges::for_each(credentials, [](PasswordForm& form) {
if (form.scheme == PasswordForm::Scheme::kUsernameOnly) {
form.skip_zero_click = true;
}
diff --git a/components/password_manager/core/browser/password_store/password_store.cc b/components/password_manager/core/browser/password_store/password_store.cc
index 8f62da2b..69241be 100644
--- a/components/password_manager/core/browser/password_store/password_store.cc
+++ b/components/password_manager/core/browser/password_store/password_store.cc
@@ -18,7 +18,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc b/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc
index fc6b350..ec8bb0d 100644
--- a/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc
+++ b/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc
@@ -79,7 +79,7 @@
write_prefs_callback,
std::optional<PasswordStoreChangeList> password_store_change_list,
bool is_account_store) {
- bool hasCredentialRemoval = base::ranges::any_of(
+ bool hasCredentialRemoval = std::ranges::any_of(
password_store_change_list.value(), [](PasswordStoreChange change) {
return change.type() == PasswordStoreChange::REMOVE;
});
diff --git a/components/password_manager/core/browser/password_store/password_store_util.cc b/components/password_manager/core/browser/password_store/password_store_util.cc
index 746d40d7..cece3f3 100644
--- a/components/password_manager/core/browser/password_store/password_store_util.cc
+++ b/components/password_manager/core/browser/password_store/password_store_util.cc
@@ -4,7 +4,7 @@
#include "components/password_manager/core/browser/password_store/password_store_util.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
namespace password_manager {
@@ -20,7 +20,7 @@
if (!changes.has_value()) {
return std::nullopt;
}
- base::ranges::copy(*changes, std::back_inserter(joined_changes));
+ std::ranges::copy(*changes, std::back_inserter(joined_changes));
}
return joined_changes;
}
diff --git a/components/password_manager/core/browser/password_suggestion_generator.cc b/components/password_manager/core/browser/password_suggestion_generator.cc
index 319246e..0996389 100644
--- a/components/password_manager/core/browser/password_suggestion_generator.cc
+++ b/components/password_manager/core/browser/password_suggestion_generator.cc
@@ -4,12 +4,12 @@
#include "components/password_manager/core/browser/password_suggestion_generator.h"
+#include <functional>
#include <set>
#include "base/base64.h"
#include "base/feature_list.h"
#include "base/i18n/case_conversion.h"
-#include "base/ranges/functional.h"
#include "base/strings/utf_string_conversions.h"
#include "components/affiliations/core/browser/affiliation_utils.h"
#include "components/autofill/core/browser/suggestions/suggestion.h"
@@ -68,7 +68,7 @@
}
void MaybeAppendManagePasswordsEntry(std::vector<Suggestion>* suggestions) {
- bool has_no_fillable_suggestions = base::ranges::none_of(
+ bool has_no_fillable_suggestions = std::ranges::none_of(
*suggestions,
[](SuggestionType id) {
return id == SuggestionType::kPasswordEntry ||
@@ -81,7 +81,7 @@
return;
}
- bool has_webauthn_credential = base::ranges::any_of(
+ bool has_webauthn_credential = std::ranges::any_of(
*suggestions,
[](SuggestionType type) {
return type == SuggestionType::kWebauthnCredential;
@@ -282,7 +282,7 @@
#if !BUILDFLAG(IS_ANDROID)
uses_passkeys = true;
#endif
- base::ranges::transform(
+ std::ranges::transform(
*delegate->GetPasskeys(), std::back_inserter(suggestions),
[&page_favicon](const auto& passkey) {
Suggestion suggestion(
@@ -394,7 +394,7 @@
for (const CredentialUIEntry& credential : credentials) {
// Check if any credential in the "Suggested" section has the same singon
// realm as this `CredentialUIEntry`.
- const bool has_suggested_realm = base::ranges::any_of(
+ const bool has_suggested_realm = std::ranges::any_of(
credential.facets,
[&suggested_signon_realms](const std::string& signon_realm) {
return suggested_signon_realms.count(signon_realm);
@@ -410,9 +410,9 @@
Suggestion::FiltrationPolicy::kFilterable);
}
- base::ranges::sort(
+ std::ranges::sort(
suggestions.begin() + relevant_section_offset, suggestions.end(),
- base::ranges::less(),
+ std::ranges::less(),
[](const Suggestion& suggestion) { return suggestion.main_text.value; });
// Add "Manage all passwords" link to settings.
diff --git a/components/password_manager/core/browser/sharing/outgoing_password_sharing_invitation_sync_bridge.cc b/components/password_manager/core/browser/sharing/outgoing_password_sharing_invitation_sync_bridge.cc
index 90ecbda..7df4170 100644
--- a/components/password_manager/core/browser/sharing/outgoing_password_sharing_invitation_sync_bridge.cc
+++ b/components/password_manager/core/browser/sharing/outgoing_password_sharing_invitation_sync_bridge.cc
@@ -99,11 +99,11 @@
CHECK(!passwords.empty());
// All `passwords` are expected to belong to the same group and hence have the
// same `username_value` and `password_value`.
- CHECK_EQ(base::ranges::count(passwords, passwords[0].username_value,
- &PasswordForm::username_value),
+ CHECK_EQ(std::ranges::count(passwords, passwords[0].username_value,
+ &PasswordForm::username_value),
static_cast<int>(passwords.size()));
- CHECK_EQ(base::ranges::count(passwords, passwords[0].password_value,
- &PasswordForm::password_value),
+ CHECK_EQ(std::ranges::count(passwords, passwords[0].password_value,
+ &PasswordForm::password_value),
static_cast<int>(passwords.size()));
if (!change_processor()->IsTrackingMetadata()) {
diff --git a/components/password_manager/core/browser/sharing/password_receiver_service_impl.cc b/components/password_manager/core/browser/sharing/password_receiver_service_impl.cc
index fc2740b..24f53645 100644
--- a/components/password_manager/core/browser/sharing/password_receiver_service_impl.cc
+++ b/components/password_manager/core/browser/sharing/password_receiver_service_impl.cc
@@ -180,7 +180,7 @@
// TODO(crbug.com/40269204): process PSL and affilated credentials if needed.
// TODO(crbug.com/40269204): process conflicting passwords differently if
// necessary.
- auto credential_with_same_username_it = base::ranges::find_if(
+ auto credential_with_same_username_it = std::ranges::find_if(
results, [this](const std::unique_ptr<PasswordForm>& result) {
return result->username_value == incoming_credentials_.username_value;
});
diff --git a/components/password_manager/core/browser/sharing/password_sender_service_impl.cc b/components/password_manager/core/browser/sharing/password_sender_service_impl.cc
index 20c023b..220b2e7 100644
--- a/components/password_manager/core/browser/sharing/password_sender_service_impl.cc
+++ b/components/password_manager/core/browser/sharing/password_sender_service_impl.cc
@@ -4,7 +4,8 @@
#include "components/password_manager/core/browser/sharing/password_sender_service_impl.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/password_manager/core/browser/password_form.h"
#include "components/password_manager/core/browser/sharing/outgoing_password_sharing_invitation_sync_bridge.h"
#include "components/sync/model/data_type_controller_delegate.h"
diff --git a/components/password_manager/core/browser/store_metrics_reporter.cc b/components/password_manager/core/browser/store_metrics_reporter.cc
index a5e63ca..c0a528f2d 100644
--- a/components/password_manager/core/browser/store_metrics_reporter.cc
+++ b/components/password_manager/core/browser/store_metrics_reporter.cc
@@ -4,13 +4,13 @@
#include "components/password_manager/core/browser/store_metrics_reporter.h"
+#include <algorithm>
#include <memory>
#include <string_view>
#include <utility>
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
@@ -327,8 +327,8 @@
GetMetricsSuffixForStore(is_account_store);
int credentials_with_non_empty_notes_count =
- base::ranges::count_if(forms, [](const auto& form) {
- return base::ranges::any_of(
+ std::ranges::count_if(forms, [](const auto& form) {
+ return std::ranges::any_of(
form->notes, [](const auto& note) { return !note.value.empty(); });
});
@@ -340,7 +340,7 @@
const std::string histogram_name =
base::StrCat({kPasswordManager, suffix_for_store,
".PasswordNotes.CountNotesPerCredential3"});
- base::ranges::for_each(forms, [histogram_name](const auto& form) {
+ std::ranges::for_each(forms, [histogram_name](const auto& form) {
if (!form->notes.empty()) {
base::UmaHistogramCounts100(histogram_name, form->notes.size());
}
@@ -399,7 +399,7 @@
const std::vector<std::unique_ptr<PasswordForm>>& forms) {
const GURL gaia_signon_realm =
GaiaUrls::GetInstance()->gaia_origin().GetURL();
- bool syncing_account_saved = base::ranges::any_of(
+ bool syncing_account_saved = std::ranges::any_of(
forms, [&gaia_signon_realm, &sync_username](const auto& form) {
return gaia_signon_realm == GURL(form->signon_realm) &&
gaia::AreEmailsSame(sync_username,
@@ -463,14 +463,14 @@
void ReportPasswordIssuesMetrics(
const std::vector<std::unique_ptr<PasswordForm>>& forms) {
- int count_leaked = base::ranges::count_if(forms, [](const auto& form) {
+ int count_leaked = std::ranges::count_if(forms, [](const auto& form) {
return form->password_issues.contains(InsecureType::kLeaked);
});
base::UmaHistogramCounts100(
base::StrCat({kPasswordManager, ".CompromisedCredentials3.CountLeaked"}),
count_leaked);
- int count_phished = base::ranges::count_if(forms, [](const auto& form) {
+ int count_phished = std::ranges::count_if(forms, [](const auto& form) {
return form->password_issues.contains(InsecureType::kPhished);
});
base::UmaHistogramCounts100(
diff --git a/components/password_manager/core/browser/sync/password_sync_bridge.cc b/components/password_manager/core/browser/sync/password_sync_bridge.cc
index ee521f4..5f6ffda 100644
--- a/components/password_manager/core/browser/sync/password_sync_bridge.cc
+++ b/components/password_manager/core/browser/sync/password_sync_bridge.cc
@@ -740,7 +740,7 @@
metrics_util::LogPasswordSyncState(
metrics_util::PasswordSyncState::kSyncingOk);
if (password_store_sync_->IsAccountStore()) {
- int password_count = base::ranges::count_if(
+ int password_count = std::ranges::count_if(
entity_data,
[](const std::unique_ptr<syncer::EntityChange>& entity_change) {
return !entity_change->data()
diff --git a/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc b/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc
index 610fa7c..57680e6 100644
--- a/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc
+++ b/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc
@@ -66,7 +66,7 @@
bool PasswordIssuesHasExpectedInsecureTypes(
const sync_pb::PasswordIssues& issues,
const std::vector<InsecureType>& expected_types) {
- return base::ranges::all_of(expected_types, [&issues](auto type) {
+ return std::ranges::all_of(expected_types, [&issues](auto type) {
switch (type) {
case InsecureType::kLeaked:
return issues.has_leaked_password_issue();
diff --git a/components/password_manager/core/browser/ui/affiliated_group.cc b/components/password_manager/core/browser/ui/affiliated_group.cc
index d10e1c1b..3bd17d8 100644
--- a/components/password_manager/core/browser/ui/affiliated_group.cc
+++ b/components/password_manager/core/browser/ui/affiliated_group.cc
@@ -43,7 +43,7 @@
}
bool operator==(const AffiliatedGroup& lhs, const AffiliatedGroup& rhs) {
- if (!base::ranges::equal(lhs.GetCredentials(), rhs.GetCredentials())) {
+ if (!std::ranges::equal(lhs.GetCredentials(), rhs.GetCredentials())) {
return false;
}
return lhs.GetDisplayName() == rhs.GetDisplayName() &&
diff --git a/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter_unittest.cc b/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter_unittest.cc
index 7ffdbd37..4a42c3e 100644
--- a/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter_unittest.cc
+++ b/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter_unittest.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/ui/bulk_leak_check_service_adapter.h"
+#include <algorithm>
#include <memory>
#include <string_view>
#include <tuple>
@@ -12,7 +13,6 @@
#include "base/containers/span.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/gmock_move_support.h"
#include "base/test/task_environment.h"
@@ -53,15 +53,15 @@
using ::testing::Return;
MATCHER_P(CredentialsAre, credentials, "") {
- return base::ranges::equal(arg, credentials.get(),
- [](const auto& lhs, const auto& rhs) {
- return lhs.username() == rhs.username() &&
- lhs.password() == rhs.password();
- });
+ return std::ranges::equal(arg, credentials.get(),
+ [](const auto& lhs, const auto& rhs) {
+ return lhs.username() == rhs.username() &&
+ lhs.password() == rhs.password();
+ });
}
MATCHER_P(SavedPasswordsAre, passwords, "") {
- return base::ranges::equal(
+ return std::ranges::equal(
arg, passwords, [](const auto& lhs, const auto& rhs) {
return lhs.signon_realm == rhs.signon_realm &&
lhs.username_value == rhs.username_value &&
diff --git a/components/password_manager/core/browser/ui/insecure_credentials_manager.cc b/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
index 163ff68..35698d9 100644
--- a/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
+++ b/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
@@ -17,7 +17,6 @@
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_functions.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/thread_pool.h"
#include "build/build_config.h"
@@ -51,7 +50,7 @@
}
bool ChangesRequireRerunningReuseCheck(const PasswordStoreChangeList& changes) {
- return base::ranges::any_of(changes, [](const auto& change) {
+ return std::ranges::any_of(changes, [](const auto& change) {
return change.type() == PasswordStoreChange::ADD ||
change.type() == PasswordStoreChange::REMOVE ||
(change.type() == PasswordStoreChange::UPDATE &&
diff --git a/components/password_manager/core/browser/ui/passwords_grouper.cc b/components/password_manager/core/browser/ui/passwords_grouper.cc
index 31b0618..7a56f14 100644
--- a/components/password_manager/core/browser/ui/passwords_grouper.cc
+++ b/components/password_manager/core/browser/ui/passwords_grouper.cc
@@ -4,12 +4,12 @@
#include "components/password_manager/core/browser/ui/passwords_grouper.h"
+#include <algorithm>
#include <string_view>
#include "base/check_op.h"
#include "base/containers/flat_set.h"
#include "base/memory/raw_span.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/string_util.h"
#include "components/affiliations/core/browser/affiliation_service.h"
@@ -118,7 +118,7 @@
for (size_t i = 0; i < passkeys_.size(); i++) {
sorted_indexes_.push_back(i);
}
- base::ranges::sort(sorted_indexes_, [this](size_t a, size_t b) {
+ std::ranges::sort(sorted_indexes_, [this](size_t a, size_t b) {
return passkeys_[a].username() < passkeys_[b].username();
});
}
@@ -251,10 +251,10 @@
std::vector<CredentialUIEntry> PasswordsGrouper::GetBlockedSites() const {
std::vector<CredentialUIEntry> results;
results.reserve(blocked_sites_.size());
- base::ranges::transform(blocked_sites_, std::back_inserter(results),
- [](const auto& key_value) {
- return CredentialUIEntry(key_value.second.front());
- });
+ std::ranges::transform(blocked_sites_, std::back_inserter(results),
+ [](const auto& key_value) {
+ return CredentialUIEntry(key_value.second.front());
+ });
// Sort blocked sites.
std::sort(results.begin(), results.end());
return results;
@@ -313,8 +313,8 @@
const std::vector<PasskeyCredential>& passkeys =
map_group_id_to_credentials_[group_id_iterator->second].passkeys;
const auto passkey_it =
- base::ranges::find(passkeys, credential.passkey_credential_id,
- &PasskeyCredential::credential_id);
+ std::ranges::find(passkeys, credential.passkey_credential_id,
+ &PasskeyCredential::credential_id);
if (passkey_it == passkeys.end()) {
return std::nullopt;
}
diff --git a/components/password_manager/core/browser/ui/post_save_compromised_helper.cc b/components/password_manager/core/browser/ui/post_save_compromised_helper.cc
index c5303d0..40f07fa 100644
--- a/components/password_manager/core/browser/ui/post_save_compromised_helper.cc
+++ b/components/password_manager/core/browser/ui/post_save_compromised_helper.cc
@@ -4,10 +4,11 @@
#include "components/password_manager/core/browser/ui/post_save_compromised_helper.h"
+#include <algorithm>
+
#include "base/barrier_closure.h"
#include "base/feature_list.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "components/password_manager/core/browser/password_store/password_store_interface.h"
#include "components/password_manager/core/common/password_manager_features.h"
@@ -75,7 +76,7 @@
void PostSaveCompromisedHelper::OnGetPasswordStoreResults(
std::vector<std::unique_ptr<PasswordForm>> results) {
- base::ranges::move(results, std::back_inserter(passwords_));
+ std::ranges::move(results, std::back_inserter(passwords_));
forms_received_.Run();
}
@@ -91,7 +92,7 @@
}
}
- if (base::ranges::any_of(form->password_issues, [](const auto& issue) {
+ if (std::ranges::any_of(form->password_issues, [](const auto& issue) {
return !issue.second.is_muted;
})) {
compromised_count_++;
diff --git a/components/password_manager/core/browser/ui/reuse_check_utility.cc b/components/password_manager/core/browser/ui/reuse_check_utility.cc
index 3202ba0..7e94182 100644
--- a/components/password_manager/core/browser/ui/reuse_check_utility.cc
+++ b/components/password_manager/core/browser/ui/reuse_check_utility.cc
@@ -64,7 +64,7 @@
}
bool HasOnlyAndroidApps(const CredentialUIEntry* credential) {
- return base::ranges::all_of(credential->facets, [](const auto& facet) {
+ return std::ranges::all_of(credential->facets, [](const auto& facet) {
return affiliations::IsValidAndroidFacetURI(facet.signon_realm);
});
}
diff --git a/components/password_manager/core/browser/ui/reuse_check_utility_unittest.cc b/components/password_manager/core/browser/ui/reuse_check_utility_unittest.cc
index 839c220..4036e57 100644
--- a/components/password_manager/core/browser/ui/reuse_check_utility_unittest.cc
+++ b/components/password_manager/core/browser/ui/reuse_check_utility_unittest.cc
@@ -24,12 +24,12 @@
CredentialUIEntry credential;
credential.username = username;
credential.password = password;
- base::ranges::transform(signon_realms, std::back_inserter(credential.facets),
- [](const std::string& signon_realm) {
- CredentialFacet facet;
- facet.signon_realm = signon_realm;
- return facet;
- });
+ std::ranges::transform(signon_realms, std::back_inserter(credential.facets),
+ [](const std::string& signon_realm) {
+ CredentialFacet facet;
+ facet.signon_realm = signon_realm;
+ return facet;
+ });
return credential;
}
diff --git a/components/password_manager/core/browser/ui/saved_passwords_presenter.cc b/components/password_manager/core/browser/ui/saved_passwords_presenter.cc
index a621c01e..8aa20ce 100644
--- a/components/password_manager/core/browser/ui/saved_passwords_presenter.cc
+++ b/components/password_manager/core/browser/ui/saved_passwords_presenter.cc
@@ -21,7 +21,6 @@
#include "base/location.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "components/password_manager/core/browser/passkey_credential.h"
@@ -58,13 +57,13 @@
&new_username](const auto& pair) {
const password_manager::PasswordForm form = pair.second;
return new_username == form.username_value &&
- base::ranges::any_of(forms_to_check, [&form](const auto& old_form) {
+ std::ranges::any_of(forms_to_check, [&form](const auto& old_form) {
return form.signon_realm == old_form.signon_realm &&
form.IsUsingAccountStore() ==
old_form.IsUsingAccountStore();
});
};
- return base::ranges::any_of(key_to_forms, has_conflicting_username);
+ return std::ranges::any_of(key_to_forms, has_conflicting_username);
}
password_manager::PasswordForm GenerateFormFromCredential(
@@ -98,7 +97,7 @@
}
bool MergeDeleteAllResultsFromPasswordStores(std::vector<bool> results) {
- return base::ranges::all_of(results, [](bool result) { return result; });
+ return std::ranges::all_of(results, [](bool result) { return result; });
}
} // namespace
@@ -236,11 +235,11 @@
};
bool existing_credential_profile =
- base::ranges::any_of(sort_key_to_password_forms_,
- have_equal_username_and_realm_in_profile_store);
+ std::ranges::any_of(sort_key_to_password_forms_,
+ have_equal_username_and_realm_in_profile_store);
bool existing_credential_account =
- base::ranges::any_of(sort_key_to_password_forms_,
- have_equal_username_and_realm_in_account_store);
+ std::ranges::any_of(sort_key_to_password_forms_,
+ have_equal_username_and_realm_in_account_store);
if (!existing_credential_profile && !existing_credential_account) {
return AddResult::kSuccess;
@@ -252,7 +251,7 @@
credential.password == pair.second.password_value;
};
- if (base::ranges::any_of(sort_key_to_password_forms_, have_exact_match)) {
+ if (std::ranges::any_of(sort_key_to_password_forms_, have_exact_match)) {
return AddResult::kExactMatch;
}
@@ -304,12 +303,12 @@
}
std::vector<PasswordForm> password_forms;
- base::ranges::transform(credentials, std::back_inserter(password_forms),
- [&](const CredentialUIEntry& credential) {
- return GenerateFormFromCredential(credential, type);
- });
+ std::ranges::transform(credentials, std::back_inserter(password_forms),
+ [&](const CredentialUIEntry& credential) {
+ return GenerateFormFromCredential(credential, type);
+ });
- CHECK(base::ranges::all_of(password_forms, [&](const PasswordForm& form) {
+ CHECK(std::ranges::all_of(password_forms, [&](const PasswordForm& form) {
return password_forms[0].in_store == form.in_store;
}));
@@ -326,7 +325,7 @@
return;
}
- CHECK(base::ranges::all_of(password_forms, [&](const PasswordForm& form) {
+ CHECK(std::ranges::all_of(password_forms, [&](const PasswordForm& form) {
return password_forms[0].in_store == form.in_store;
}));
@@ -425,8 +424,8 @@
#if BUILDFLAG(IS_ANDROID)
const auto range =
sort_key_to_password_forms_.equal_range(CreateSortKey(credential));
- base::ranges::transform(range.first, range.second, std::back_inserter(forms),
- [](const auto& pair) { return pair.second; });
+ std::ranges::transform(range.first, range.second, std::back_inserter(forms),
+ [](const auto& pair) { return pair.second; });
#else
forms = passwords_grouper_->GetPasswordFormsFor(credential);
#endif
diff --git a/components/password_manager/core/browser/votes_uploader.cc b/components/password_manager/core/browser/votes_uploader.cc
index c34f26b..894ee81c 100644
--- a/components/password_manager/core/browser/votes_uploader.cc
+++ b/components/password_manager/core/browser/votes_uploader.cc
@@ -4,6 +4,7 @@
#include "components/password_manager/core/browser/votes_uploader.h"
+#include <algorithm>
#include <iostream>
#include <optional>
#include <string>
@@ -15,7 +16,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -194,8 +194,8 @@
// It is expected that |password| contains at least one special symbol.
int GetRandomSpecialSymbolFromPassword(const std::u16string& password) {
std::vector<int> symbols;
- base::ranges::copy_if(password, std::back_inserter(symbols),
- &password_manager_util::IsSpecialSymbol);
+ std::ranges::copy_if(password, std::back_inserter(symbols),
+ &password_manager_util::IsSpecialSymbol);
DCHECK(!symbols.empty()) << "Password must contain at least one symbol.";
return symbols[base::RandGenerator(symbols.size())];
}
@@ -264,7 +264,7 @@
bool IsUsernameInAlternativeUsernames(
const std::u16string& username,
const AlternativeElementVector& all_alternative_usernames) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
all_alternative_usernames,
[username](const AlternativeElement& alternative_username) {
return alternative_username.value == username;
@@ -628,10 +628,10 @@
#if !BUILDFLAG(IS_ANDROID)
bool should_send_votes =
(should_send_username_first_flow_votes_ ||
- base::ranges::any_of(single_username_votes_data_,
- [](const SingleUsernameVoteData& vote_data) {
- return vote_data.is_form_overrule;
- }));
+ std::ranges::any_of(single_username_votes_data_,
+ [](const SingleUsernameVoteData& vote_data) {
+ return vote_data.is_form_overrule;
+ }));
// Send single username votes in two cases:
// (1) `should_send_username_first_flow_votes_` is true, meaning Username
// First Flow was observed.
@@ -859,7 +859,7 @@
bool respond_randomly = base::RandGenerator(2);
bool randomized_value_for_character_class =
respond_randomly ? base::RandGenerator(2)
- : base::ranges::any_of(password_value, predicate);
+ : std::ranges::any_of(password_value, predicate);
PasswordAttributesMetadata password_attributes;
password_attributes.password_attributes_vote = std::make_pair(
character_class_attribute, randomized_value_for_character_class);
diff --git a/components/password_manager/core/common/password_manager_util.cc b/components/password_manager/core/common/password_manager_util.cc
index 9a4de1d..f3ff84d4 100644
--- a/components/password_manager/core/common/password_manager_util.cc
+++ b/components/password_manager/core/common/password_manager_util.cc
@@ -4,8 +4,9 @@
#include "components/password_manager/core/common/password_manager_util.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "components/autofill/core/common/autofill_regexes.h"
#include "components/autofill/core/common/form_data.h"
#include "components/autofill/core/common/form_field_data.h"
@@ -31,7 +32,7 @@
bool IsRendererRecognizedCredentialForm(const autofill::FormData& form) {
// TODO(crbug.com/40276126): Consolidate with the parsing logic in
// form_autofill_util.cc.
- return base::ranges::any_of(
+ return std::ranges::any_of(
form.fields(), [](const autofill::FormFieldData& field) {
return field.IsPasswordInputElement() ||
field.autocomplete_attribute().find(
diff --git a/components/password_manager/ios/account_select_fill_data.cc b/components/password_manager/ios/account_select_fill_data.cc
index e6fed12..14d64f96 100644
--- a/components/password_manager/ios/account_select_fill_data.cc
+++ b/components/password_manager/ios/account_select_fill_data.cc
@@ -4,8 +4,9 @@
#include "components/password_manager/ios/account_select_fill_data.h"
+#include <algorithm>
+
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "components/autofill/core/common/password_form_fill_data.h"
#include "components/password_manager/core/browser/features/password_features.h"
@@ -33,7 +34,7 @@
return c.username.empty();
};
return !(is_single_username &&
- base::ranges::all_of(credentials, has_empty_username));
+ std::ranges::all_of(credentials, has_empty_username));
}
} // namespace
@@ -140,7 +141,7 @@
return nullptr;
}
- auto it = base::ranges::find(credentials_, username, &Credential::username);
+ auto it = std::ranges::find(credentials_, username, &Credential::username);
if (it == credentials_.end())
return nullptr;
const Credential& credential = *it;
diff --git a/components/password_manager/ios/shared_password_controller.mm b/components/password_manager/ios/shared_password_controller.mm
index 7030115..502048d 100644
--- a/components/password_manager/ios/shared_password_controller.mm
+++ b/components/password_manager/ios/shared_password_controller.mm
@@ -20,7 +20,6 @@
#import "base/functional/bind.h"
#import "base/memory/raw_ptr.h"
#import "base/metrics/histogram_macros.h"
-#import "base/ranges/algorithm.h"
#import "base/scoped_multi_source_observation.h"
#import "base/strings/sys_string_conversions.h"
#import "base/strings/utf_string_conversions.h"
diff --git a/components/payments/content/manifest_verifier.cc b/components/payments/content/manifest_verifier.cc
index 467102ac..740faf3b 100644
--- a/components/payments/content/manifest_verifier.cc
+++ b/components/payments/content/manifest_verifier.cc
@@ -6,13 +6,13 @@
#include <stdint.h>
+#include <algorithm>
#include <utility>
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "components/payments/content/payment_manifest_web_data_service.h"
@@ -230,8 +230,8 @@
DCHECK_LT(0U, number_of_manifests_to_download_);
std::vector<std::string> supported_origin_strings(supported_origins.size());
- base::ranges::transform(supported_origins, supported_origin_strings.begin(),
- &url::Origin::Serialize);
+ std::ranges::transform(supported_origins, supported_origin_strings.begin(),
+ &url::Origin::Serialize);
if (cached_manifest_urls_.find(method_manifest_url) ==
cached_manifest_urls_.end()) {
diff --git a/components/payments/content/payment_request.cc b/components/payments/content/payment_request.cc
index 124e49f..3ec5d4f 100644
--- a/components/payments/content/payment_request.cc
+++ b/components/payments/content/payment_request.cc
@@ -4,6 +4,7 @@
#include "components/payments/content/payment_request.h"
+#include <algorithm>
#include <string>
#include <utility>
@@ -12,7 +13,6 @@
#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "components/payments/content/content_payment_request_delegate.h"
#include "components/payments/content/has_enrolled_instrument_query_factory.h"
@@ -161,7 +161,7 @@
return;
}
- if (base::ranges::any_of(method_data, [](const auto& datum) {
+ if (std::ranges::any_of(method_data, [](const auto& datum) {
return !datum || datum->supported_method.empty();
})) {
log_.Error(errors::kMethodNameRequired);
@@ -231,7 +231,7 @@
method_categories.push_back(
JourneyLogger::PaymentMethodCategory::kSecurePaymentConfirmation);
}
- if (base::ranges::any_of(
+ if (std::ranges::any_of(
spec_->url_payment_method_identifiers(), [&](const GURL& url) {
return url != google_pay_url && url != android_pay_url &&
url != google_play_billing_url;
diff --git a/components/payments/content/payment_request_spec.cc b/components/payments/content/payment_request_spec.cc
index 53ac192..0eb6534 100644
--- a/components/payments/content/payment_request_spec.cc
+++ b/components/payments/content/payment_request_spec.cc
@@ -4,6 +4,7 @@
#include "components/payments/content/payment_request_spec.h"
+#include <algorithm>
#include <utility>
#include "base/check.h"
@@ -11,7 +12,6 @@
#include "base/feature_list.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -282,7 +282,7 @@
bool PaymentRequestSpec::IsMixedCurrency() const {
DCHECK(details_->display_items);
const std::string& total_currency = details_->total->amount->currency;
- return base::ranges::any_of(
+ return std::ranges::any_of(
*details_->display_items,
[&total_currency](const mojom::PaymentItemPtr& item) {
return item->amount->currency != total_currency;
@@ -393,8 +393,8 @@
// one in the array that has its selected field set to true. If none are
// selected by the merchant, |selected_shipping_option_| stays nullptr.
auto selected_shipping_option_it =
- base::ranges::find_if(base::Reversed(*details_->shipping_options),
- &payments::mojom::PaymentShippingOption::selected);
+ std::ranges::find_if(base::Reversed(*details_->shipping_options),
+ &payments::mojom::PaymentShippingOption::selected);
if (selected_shipping_option_it != details_->shipping_options->rend()) {
selected_shipping_option_ = selected_shipping_option_it->get();
}
diff --git a/components/payments/content/payment_request_state.cc b/components/payments/content/payment_request_state.cc
index 3623030df..e8daf39 100644
--- a/components/payments/content/payment_request_state.cc
+++ b/components/payments/content/payment_request_state.cc
@@ -4,6 +4,7 @@
#include "components/payments/content/payment_request_state.h"
+#include <algorithm>
#include <set>
#include <utility>
#include <vector>
@@ -15,7 +16,6 @@
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
#include "components/autofill/core/browser/data_manager/addresses/address_data_manager.h"
@@ -183,7 +183,7 @@
if (IsInTwa()) {
// If a preferred payment app is present (e.g. Play Billing within a TWA),
// all other payment apps are ignored.
- bool has_preferred_app = base::ranges::any_of(
+ bool has_preferred_app = std::ranges::any_of(
available_apps_, [](const auto& app) { return app->IsPreferred(); });
if (has_preferred_app) {
std::erase_if(available_apps_,
@@ -199,7 +199,7 @@
SetDefaultProfileSelections();
get_all_apps_finished_ = true;
- has_enrolled_instrument_ = base::ranges::any_of(
+ has_enrolled_instrument_ = std::ranges::any_of(
available_apps_,
[](const auto& app) { return app->HasEnrolledInstrument(); });
are_requested_methods_supported_ |= !available_apps_.empty();
diff --git a/components/payments/content/secure_payment_confirmation_app_factory.cc b/components/payments/content/secure_payment_confirmation_app_factory.cc
index e3de71b..803f05b 100644
--- a/components/payments/content/secure_payment_confirmation_app_factory.cc
+++ b/components/payments/content/secure_payment_confirmation_app_factory.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <algorithm>
#include <memory>
#include <optional>
#include <string>
@@ -16,7 +17,6 @@
#include "base/check.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "components/payments/content/payment_manifest_web_data_service.h"
@@ -288,7 +288,7 @@
: PaymentAppFactory(PaymentApp::Type::INTERNAL) {}
SecurePaymentConfirmationAppFactory::~SecurePaymentConfirmationAppFactory() {
- base::ranges::for_each(requests_, [&](const auto& pair) {
+ std::ranges::for_each(requests_, [&](const auto& pair) {
if (pair.second->web_data_service)
pair.second->web_data_service->CancelRequest(pair.first);
});
diff --git a/components/payments/core/error_message_util.cc b/components/payments/core/error_message_util.cc
index 864507b..9021c3d 100644
--- a/components/payments/core/error_message_util.cc
+++ b/components/payments/core/error_message_util.cc
@@ -4,11 +4,11 @@
#include "components/payments/core/error_message_util.h"
+#include <algorithm>
#include <optional>
#include <vector>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "components/payments/core/error_strings.h"
@@ -23,7 +23,7 @@
template <class Collection>
std::string concatNamesWithQuotesAndCommma(const Collection& names) {
std::vector<std::string> with_quotes(names.size());
- base::ranges::transform(
+ std::ranges::transform(
names, with_quotes.begin(),
[](const std::string& method_name) { return "\"" + method_name + "\""; });
std::string result = base::JoinString(with_quotes, ", ");
diff --git a/components/pdf/renderer/pdf_accessibility_tree.cc b/components/pdf/renderer/pdf_accessibility_tree.cc
index 8b6ce99..23ecee36 100644
--- a/components/pdf/renderer/pdf_accessibility_tree.cc
+++ b/components/pdf/renderer/pdf_accessibility_tree.cc
@@ -21,7 +21,6 @@
#include "base/memory/raw_ref.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "components/pdf/renderer/pdf_accessibility_tree_builder.h"
@@ -55,7 +54,7 @@
namespace pdf {
-namespace ranges = base::ranges;
+namespace ranges = std::ranges;
namespace {
@@ -1209,7 +1208,7 @@
ax::mojom::IntListAttribute::kCharacterOffsets);
float ratio = static_cast<float>(new_width) / original_width;
- base::ranges::for_each(character_offsets, [ratio](int32_t& offset) {
+ std::ranges::for_each(character_offsets, [ratio](int32_t& offset) {
offset = static_cast<int32_t>(offset * ratio);
});
node_from_ocr.AddIntListAttribute(
diff --git a/components/performance_manager/v8_memory/web_memory_aggregator.cc b/components/performance_manager/v8_memory/web_memory_aggregator.cc
index 55bdda1..0fdb0d8 100644
--- a/components/performance_manager/v8_memory/web_memory_aggregator.cc
+++ b/components/performance_manager/v8_memory/web_memory_aggregator.cc
@@ -4,6 +4,7 @@
#include "components/performance_manager/v8_memory/web_memory_aggregator.h"
+#include <algorithm>
#include <utility>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/containers/stack.h"
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "components/performance_manager/public/graph/frame_node.h"
#include "components/performance_manager/public/graph/page_node.h"
#include "components/performance_manager/public/graph/worker_node.h"
@@ -323,13 +323,13 @@
// point.
#if DCHECK_IS_ON()
auto client_frames = worker_node->GetClientFrames();
- DCHECK(base::ranges::all_of(
+ DCHECK(std::ranges::all_of(
client_frames, [worker_node](const FrameNode* client) {
return client->GetOrigin().has_value() &&
client->GetOrigin()->IsSameOriginWith(worker_node->GetOrigin());
}));
auto client_workers = worker_node->GetClientWorkers();
- DCHECK(base::ranges::all_of(
+ DCHECK(std::ranges::all_of(
client_workers, [worker_node](const WorkerNode* client) {
return client->GetOrigin().IsSameOriginWith(worker_node->GetOrigin());
}));
@@ -443,10 +443,9 @@
CHECK(!top_frames.empty());
const url::Origin main_origin = top_frames.front()->GetOrigin().value();
- DCHECK(
- base::ranges::all_of(top_frames, [&main_origin](const FrameNode* node) {
- return node->GetOrigin()->IsSameOriginWith(main_origin);
- }));
+ DCHECK(std::ranges::all_of(top_frames, [&main_origin](const FrameNode* node) {
+ return node->GetOrigin()->IsSameOriginWith(main_origin);
+ }));
AggregationPointVisitor ap_visitor(requesting_origin_,
requesting_process_node_, main_origin);
diff --git a/components/performance_manager/v8_memory/web_memory_impl.cc b/components/performance_manager/v8_memory/web_memory_impl.cc
index 89a544c..a2245c1 100644
--- a/components/performance_manager/v8_memory/web_memory_impl.cc
+++ b/components/performance_manager/v8_memory/web_memory_impl.cc
@@ -4,6 +4,7 @@
#include "components/performance_manager/v8_memory/web_memory_impl.h"
+#include <algorithm>
#include <memory>
#include <utility>
@@ -12,7 +13,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "components/performance_manager/public/graph/frame_node.h"
#include "components/performance_manager/public/graph/graph.h"
#include "components/performance_manager/public/graph/page_node.h"
@@ -40,7 +40,7 @@
const ProcessNode* process_node) {
const auto& frame_nodes = process_node->GetFrameNodes();
const auto it =
- base::ranges::find(frame_nodes, frame_token, &FrameNode::GetFrameToken);
+ std::ranges::find(frame_nodes, frame_token, &FrameNode::GetFrameToken);
if (it == frame_nodes.end()) {
// The frame no longer exists.
diff --git a/components/permissions/bluetooth_chooser_controller.cc b/components/permissions/bluetooth_chooser_controller.cc
index d685d73..8d183fd 100644
--- a/components/permissions/bluetooth_chooser_controller.cc
+++ b/components/permissions/bluetooth_chooser_controller.cc
@@ -4,10 +4,11 @@
#include "components/permissions/bluetooth_chooser_controller.h"
+#include <algorithm>
+
#include "base/check_op.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/strings/grit/components_branded_strings.h"
#include "components/strings/grit/components_strings.h"
@@ -187,7 +188,7 @@
}
auto device_it =
- base::ranges::find(devices_, device_id, &BluetoothDeviceInfo::id);
+ std::ranges::find(devices_, device_id, &BluetoothDeviceInfo::id);
CHECK(device_it != devices_.end(), base::NotFatalUntil::M130);
// When Bluetooth device scanning stops, the |signal_strength_level|
@@ -216,7 +217,7 @@
return;
auto device_it =
- base::ranges::find(devices_, device_id, &BluetoothDeviceInfo::id);
+ std::ranges::find(devices_, device_id, &BluetoothDeviceInfo::id);
if (device_it != devices_.end()) {
size_t index = device_it - devices_.begin();
diff --git a/components/permissions/bluetooth_scanning_prompt_controller.cc b/components/permissions/bluetooth_scanning_prompt_controller.cc
index cac3e77..df7f295 100644
--- a/components/permissions/bluetooth_scanning_prompt_controller.cc
+++ b/components/permissions/bluetooth_scanning_prompt_controller.cc
@@ -4,8 +4,9 @@
#include "components/permissions/bluetooth_scanning_prompt_controller.h"
+#include <algorithm>
+
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -128,7 +129,7 @@
++device_name_counts_[device_name_for_display];
}
- auto device_id_it = base::ranges::find(device_ids_, device_id);
+ auto device_id_it = std::ranges::find(device_ids_, device_id);
CHECK(device_id_it != device_ids_.end(), base::NotFatalUntil::M130);
if (view())
diff --git a/components/permissions/permission_actions_history.cc b/components/permissions/permission_actions_history.cc
index bc161bd9..c08b63d 100644
--- a/components/permissions/permission_actions_history.cc
+++ b/components/permissions/permission_actions_history.cc
@@ -3,13 +3,13 @@
// found in the LICENSE file.
#include "components/permissions/permission_actions_history.h"
+#include <algorithm>
#include <optional>
#include <string_view>
#include <vector>
#include "base/containers/adapters.h"
#include "base/json/values_util.h"
-#include "base/ranges/algorithm.h"
#include "base/values.h"
#include "build/build_config.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -63,7 +63,7 @@
permission_actions.end());
}
- base::ranges::sort(
+ std::ranges::sort(
matching_actions, {},
[](const PermissionActionsHistory::Entry& entry) { return entry.time; });
return matching_actions;
diff --git a/components/permissions/permission_actions_history_unittest.cc b/components/permissions/permission_actions_history_unittest.cc
index ad23be37..1c69dea 100644
--- a/components/permissions/permission_actions_history_unittest.cc
+++ b/components/permissions/permission_actions_history_unittest.cc
@@ -4,12 +4,12 @@
#include "components/permissions/permission_actions_history.h"
+#include <algorithm>
#include <optional>
#include <vector>
#include "base/containers/adapters.h"
#include "base/json/json_reader.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
@@ -163,7 +163,7 @@
base::Time::Now() - base::Days(1),
PermissionActionsHistory::EntryFilter::WANT_ALL_PROMPTS);
- EXPECT_TRUE(base::ranges::equal(
+ EXPECT_TRUE(std::ranges::equal(
entries_1_day, std::vector<PermissionActionsHistory::Entry>(
all_entries.begin() + 5, all_entries.end())));
}
diff --git a/components/permissions/permission_hats_trigger_helper.cc b/components/permissions/permission_hats_trigger_helper.cc
index f49150fd..735ae3e8 100644
--- a/components/permissions/permission_hats_trigger_helper.cc
+++ b/components/permissions/permission_hats_trigger_helper.cc
@@ -4,6 +4,7 @@
#include "components/permissions/permission_hats_trigger_helper.h"
+#include <algorithm>
#include <optional>
#include <string_view>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/check_is_test.h"
#include "base/no_destructor.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -42,11 +42,10 @@
bool StringMatchesFilter(const std::string& string, const std::string& filter) {
return filter.empty() ||
- base::ranges::any_of(SplitCsvString(filter),
- [string](std::string_view current_filter) {
- return base::EqualsCaseInsensitiveASCII(
- string, current_filter);
- });
+ std::ranges::any_of(
+ SplitCsvString(filter), [string](std::string_view current_filter) {
+ return base::EqualsCaseInsensitiveASCII(string, current_filter);
+ });
}
std::map<std::string, std::pair<std::string, std::string>>
@@ -117,7 +116,7 @@
}
// Returns false if all filter parameters are empty.
- return !base::ranges::all_of(filter_pair_map, [](const auto& entry) {
+ return !std::ranges::all_of(filter_pair_map, [](const auto& entry) {
return entry.second.second.empty();
});
}
diff --git a/components/permissions/permission_manager.cc b/components/permissions/permission_manager.cc
index 65242785..28ef2f3 100644
--- a/components/permissions/permission_manager.cc
+++ b/components/permissions/permission_manager.cc
@@ -4,13 +4,13 @@
#include "components/permissions/permission_manager.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
@@ -41,8 +41,8 @@
base::OnceCallback<void(const std::vector<PermissionStatus>&)> callback,
const std::vector<ContentSetting>& content_settings) {
std::vector<PermissionStatus> permission_statuses;
- base::ranges::transform(content_settings, back_inserter(permission_statuses),
- PermissionUtil::ContentSettingToPermissionStatus);
+ std::ranges::transform(content_settings, back_inserter(permission_statuses),
+ PermissionUtil::ContentSettingToPermissionStatus);
std::move(callback).Run(permission_statuses);
}
@@ -226,9 +226,9 @@
base::OnceCallback<void(const std::vector<PermissionStatus>&)>
permission_status_callback) {
std::vector<ContentSettingsType> permissions;
- base::ranges::transform(request_description.permissions,
- back_inserter(permissions),
- PermissionUtil::PermissionTypeToContentSettingsType);
+ std::ranges::transform(request_description.permissions,
+ back_inserter(permissions),
+ PermissionUtil::PermissionTypeToContentSettingsType);
base::OnceCallback<void(const std::vector<ContentSetting>&)> callback =
base::BindOnce(&PermissionStatusVectorCallbackWrapper,
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
index a57da81..e9712507 100644
--- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc
@@ -4,6 +4,7 @@
#include "components/permissions/permission_request_manager.h"
+#include <algorithm>
#include <string>
#include "base/auto_reset.h"
@@ -16,7 +17,6 @@
#include "base/metrics/user_metrics_action.h"
#include "base/observer_list.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/clock.h"
#include "base/time/time.h"
@@ -1261,7 +1261,7 @@
void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
PermissionRequest* request,
bool is_one_time) {
- DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
+ DCHECK_EQ(1ul, std::ranges::count(requests_, request) +
pending_permission_requests_.Count(request))
<< "Only requests in [pending_permission_]requests_ can have duplicates";
request->PermissionGranted(is_one_time);
@@ -1277,7 +1277,7 @@
void PermissionRequestManager::PermissionDeniedIncludingDuplicates(
PermissionRequest* request) {
- DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
+ DCHECK_EQ(1ul, std::ranges::count(requests_, request) +
pending_permission_requests_.Count(request))
<< "Only requests in [pending_permission_]requests_ can have duplicates";
request->PermissionDenied();
@@ -1292,7 +1292,7 @@
void PermissionRequestManager::CancelledIncludingDuplicates(
PermissionRequest* request,
bool is_final_decision) {
- DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
+ DCHECK_EQ(1ul, std::ranges::count(requests_, request) +
pending_permission_requests_.Count(request))
<< "Only requests in [pending_permission_]requests_ can have duplicates";
request->Cancelled(is_final_decision);
@@ -1308,7 +1308,7 @@
void PermissionRequestManager::RequestFinishedIncludingDuplicates(
PermissionRequest* request) {
- DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
+ DCHECK_EQ(1ul, std::ranges::count(requests_, request) +
pending_permission_requests_.Count(request))
<< "Only requests in [pending_permission_]requests_ can have duplicates";
auto duplicate_list = VisitDuplicateRequests(
diff --git a/components/permissions/permission_request_queue.cc b/components/permissions/permission_request_queue.cc
index afe548a..f9ce0562 100644
--- a/components/permissions/permission_request_queue.cc
+++ b/components/permissions/permission_request_queue.cc
@@ -4,7 +4,8 @@
#include "components/permissions/permission_request_queue.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/permissions/permission_request.h"
#include "components/permissions/permission_util.h"
@@ -22,7 +23,7 @@
size_t PermissionRequestQueue::Count(PermissionRequest* request) const {
size_t count = 0;
for (const auto& request_list : queued_requests_) {
- count += base::ranges::count(request_list, request);
+ count += std::ranges::count(request_list, request);
}
return count;
}
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index 0265815a..fa509af 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -237,7 +237,7 @@
std::vector<raw_ptr<permissions::PermissionRequest, VectorExperimental>>
requests = delegate->Requests();
- return base::ranges::all_of(
+ return std::ranges::all_of(
requests, [](permissions::PermissionRequest* request) {
return (request->request_type() ==
permissions::RequestType::kCameraStream ||
diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc
index 0531b29d7..c8614d40b 100644
--- a/components/permissions/request_type.cc
+++ b/components/permissions/request_type.cc
@@ -4,12 +4,13 @@
#include "components/permissions/request_type.h"
+#include <algorithm>
+
#include "base/check.h"
#include "base/containers/contains.h"
#include "base/containers/fixed_flat_set.h"
#include "base/feature_list.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/permissions/features.h"
#include "components/permissions/permission_request.h"
diff --git a/components/permissions/test/mock_permission_prompt_factory.cc b/components/permissions/test/mock_permission_prompt_factory.cc
index 772a00a..1368e23 100644
--- a/components/permissions/test/mock_permission_prompt_factory.cc
+++ b/components/permissions/test/mock_permission_prompt_factory.cc
@@ -4,11 +4,12 @@
#include "components/permissions/test/mock_permission_prompt_factory.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "components/permissions/permission_request_manager.h"
#include "components/permissions/request_type.h"
@@ -110,7 +111,7 @@
}
void MockPermissionPromptFactory::HideView(MockPermissionPrompt* prompt) {
- auto it = base::ranges::find(prompts_, prompt);
+ auto it = std::ranges::find(prompts_, prompt);
if (it != prompts_.end())
prompts_.erase(it);
}
diff --git a/components/plus_addresses/metrics/plus_address_submission_logger.cc b/components/plus_addresses/metrics/plus_address_submission_logger.cc
index 04bb029..d0254ca 100644
--- a/components/plus_addresses/metrics/plus_address_submission_logger.cc
+++ b/components/plus_addresses/metrics/plus_address_submission_logger.cc
@@ -117,10 +117,10 @@
return;
}
auto it =
- base::ranges::find_if(form_structure->fields(),
- [&field](const std::unique_ptr<AutofillField>& f) {
- return f->global_id() == field;
- });
+ std::ranges::find_if(form_structure->fields(),
+ [&field](const std::unique_ptr<AutofillField>& f) {
+ return f->global_id() == field;
+ });
if (it == form_structure->fields().end()) {
return;
}
@@ -130,7 +130,7 @@
managers_observation_.AddObservation(&manager);
}
- const size_t field_count_in_renderer_form = base::ranges::count_if(
+ const size_t field_count_in_renderer_form = std::ranges::count_if(
form_structure->fields(),
[renderer_form_id](
const std::unique_ptr<autofill::AutofillField>& field) {
diff --git a/components/plus_addresses/webdata/plus_address_sync_bridge.cc b/components/plus_addresses/webdata/plus_address_sync_bridge.cc
index 6681525c..a57629e 100644
--- a/components/plus_addresses/webdata/plus_address_sync_bridge.cc
+++ b/components/plus_addresses/webdata/plus_address_sync_bridge.cc
@@ -4,12 +4,12 @@
#include "components/plus_addresses/webdata/plus_address_sync_bridge.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include "base/check.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/affiliations/core/browser/affiliation_utils.h"
#include "components/plus_addresses/plus_address_types.h"
#include "components/plus_addresses/webdata/plus_address_sync_util.h"
diff --git a/components/policy/core/browser/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc
index 204f1d7f..48ca0e1 100644
--- a/components/policy/core/browser/policy_error_map.cc
+++ b/components/policy/core/browser/policy_error_map.cc
@@ -4,6 +4,7 @@
#include "components/policy/core/browser/policy_error_map.h"
+#include <algorithm>
#include <iterator>
#include <string>
#include <string_view>
@@ -12,7 +13,6 @@
#include "base/check.h"
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/policy/core/common/schema.h"
@@ -48,7 +48,7 @@
replacements_(std::move(replacements)),
error_path_string_(ErrorPathToString(policy_name, error_path)),
level_(level) {
- DCHECK(!base::ranges::any_of(replacements_, &std::string::empty));
+ DCHECK(!std::ranges::any_of(replacements_, &std::string::empty));
}
PendingError(const PendingError&) = delete;
PendingError& operator=(const PendingError&) = delete;
@@ -71,9 +71,9 @@
// AddError(policy, message, error_path) and add a DCHECK
if (message_id_ >= 0) {
std::vector<std::u16string> utf_16_replacements;
- base::ranges::transform(replacements_,
- std::back_inserter(utf_16_replacements),
- &ConvertReplacementToUTF16);
+ std::ranges::transform(replacements_,
+ std::back_inserter(utf_16_replacements),
+ &ConvertReplacementToUTF16);
return l10n_util::GetStringFUTF16(message_id_, utf_16_replacements,
nullptr);
}
diff --git a/components/policy/core/common/android/policy_converter.cc b/components/policy/core/common/android/policy_converter.cc
index 3cebf15..6c16ea5 100644
--- a/components/policy/core/common/android/policy_converter.cc
+++ b/components/policy/core/common/android/policy_converter.cc
@@ -4,6 +4,7 @@
#include "components/policy/core/common/android/policy_converter.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/check_op.h"
#include "base/json/json_reader.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/values.h"
@@ -46,7 +46,7 @@
base::Value::List as_list;
std::vector<std::string> items_as_vector = base::SplitString(
str_value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
- base::ranges::for_each(items_as_vector, [&as_list](const std::string& item) {
+ std::ranges::for_each(items_as_vector, [&as_list](const std::string& item) {
as_list.Append(base::Value(item));
});
return base::Value(std::move(as_list));
diff --git a/components/policy/core/common/policy_map.cc b/components/policy/core/common/policy_map.cc
index 2126894c..e6d846d7f 100644
--- a/components/policy/core/common/policy_map.cc
+++ b/components/policy/core/common/policy_map.cc
@@ -4,13 +4,13 @@
#include "components/policy/core/common/policy_map.h"
+#include <algorithm>
#include <optional>
#include <utility>
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/functional/callback.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
#include "base/types/optional_util.h"
@@ -574,7 +574,7 @@
}
bool PolicyMap::Equals(const PolicyMap& other) const {
- return base::ranges::equal(*this, other, MapEntryEquals);
+ return std::ranges::equal(*this, other, MapEntryEquals);
}
bool PolicyMap::empty() const {
diff --git a/components/policy/core/common/policy_service_impl.cc b/components/policy/core/common/policy_service_impl.cc
index 216d207..9ca5608 100644
--- a/components/policy/core/common/policy_service_impl.cc
+++ b/components/policy/core/common/policy_service_impl.cc
@@ -24,7 +24,6 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
@@ -323,7 +322,7 @@
}
void PolicyServiceImpl::OnUpdatePolicy(ConfigurationPolicyProvider* provider) {
- DCHECK_EQ(1, base::ranges::count(providers_, provider));
+ DCHECK_EQ(1, std::ranges::count(providers_, provider));
refresh_pending_.erase(provider);
provider_update_pending_.insert(provider);
@@ -582,7 +581,7 @@
// domain status changes to ready. Ignore if scope is unspecified.
if (policy_domain_status_[POLICY_DOMAIN_CHROME] ==
PolicyDomainStatus::kPolicyReady &&
- base::ranges::find(updated_domains, POLICY_DOMAIN_CHROME) !=
+ std::ranges::find(updated_domains, POLICY_DOMAIN_CHROME) !=
updated_domains.end()) {
RecordInitializationTime(
scope_for_metrics_,
diff --git a/components/policy/test_support/request_handler_for_register_browser.cc b/components/policy/test_support/request_handler_for_register_browser.cc
index 976d647..0d0eec1 100644
--- a/components/policy/test_support/request_handler_for_register_browser.cc
+++ b/components/policy/test_support/request_handler_for_register_browser.cc
@@ -64,9 +64,9 @@
KeyValueFromUrl(request.GetURL(), dm_protocol::kParamDeviceID);
client_info.device_token = device_token;
client_info.machine_name = register_browser_request.machine_name();
- base::ranges::copy(allowed_policy_types(),
- std::inserter(client_info.allowed_policy_types,
- client_info.allowed_policy_types.end()));
+ std::ranges::copy(allowed_policy_types(),
+ std::inserter(client_info.allowed_policy_types,
+ client_info.allowed_policy_types.end()));
client_storage()->RegisterClient(std::move(client_info));
return CreateHttpResponse(net::HTTP_OK, device_management_response);
diff --git a/components/policy/test_support/test_server_helpers.cc b/components/policy/test_support/test_server_helpers.cc
index 83a9c20..c65ad8c 100644
--- a/components/policy/test_support/test_server_helpers.cc
+++ b/components/policy/test_support/test_server_helpers.cc
@@ -4,10 +4,10 @@
#include "components/policy/test_support/test_server_helpers.h"
+#include <algorithm>
#include <ranges>
#include <utility>
-#include "base/ranges/algorithm.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "net/base/url_util.h"
diff --git a/components/power_bookmarks/core/bookmark_client_base.cc b/components/power_bookmarks/core/bookmark_client_base.cc
index 1fbfbfc..615c818 100644
--- a/components/power_bookmarks/core/bookmark_client_base.cc
+++ b/components/power_bookmarks/core/bookmark_client_base.cc
@@ -49,7 +49,7 @@
void BookmarkClientBase::RemoveSuggestedSaveLocationProvider(
SuggestedSaveLocationProvider* suggestion_provider) {
- auto it = base::ranges::find(save_location_providers_, suggestion_provider);
+ auto it = std::ranges::find(save_location_providers_, suggestion_provider);
if (it != save_location_providers_.end()) {
save_location_providers_.erase(it);
}
diff --git a/components/power_bookmarks/core/power_bookmark_service.cc b/components/power_bookmarks/core/power_bookmark_service.cc
index a6af38d..0e5d1e7 100644
--- a/components/power_bookmarks/core/power_bookmark_service.cc
+++ b/components/power_bookmarks/core/power_bookmark_service.cc
@@ -4,8 +4,9 @@
#include "components/power_bookmarks/core/power_bookmark_service.h"
+#include <algorithm>
+
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/power_bookmarks/common/power.h"
@@ -168,7 +169,7 @@
void PowerBookmarkService::RemoveDataProvider(
PowerBookmarkDataProvider* data_provider) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- auto it = base::ranges::find(data_providers_, data_provider);
+ auto it = std::ranges::find(data_providers_, data_provider);
if (it != data_providers_.end())
data_providers_.erase(it);
}
diff --git a/components/power_bookmarks/storage/power_bookmark_database_impl_unittest.cc b/components/power_bookmarks/storage/power_bookmark_database_impl_unittest.cc
index 13043cb..fd020c4e 100644
--- a/components/power_bookmarks/storage/power_bookmark_database_impl_unittest.cc
+++ b/components/power_bookmarks/storage/power_bookmark_database_impl_unittest.cc
@@ -4,13 +4,13 @@
#include "components/power_bookmarks/storage/power_bookmark_database_impl.h"
+#include <algorithm>
#include <memory>
#include <vector>
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/metrics/histogram_tester.h"
#include "build/build_config.h"
diff --git a/components/prefs/json_pref_store.cc b/components/prefs/json_pref_store.cc
index 5401e20..d2d75df 100644
--- a/components/prefs/json_pref_store.cc
+++ b/components/prefs/json_pref_store.cc
@@ -26,7 +26,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/sequenced_task_runner.h"
@@ -132,7 +131,7 @@
// histograms.xml.
static constexpr std::array<const char*, 4> kAllowList{
"Secure_Preferences", "Preferences", "Local_State", "AccountPreferences"};
- auto it = base::ranges::find(kAllowList, spaceless_basename);
+ auto it = std::ranges::find(kAllowList, spaceless_basename);
return it != kAllowList.end() ? *it : "";
}
diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
index 218ae4c2..622503a 100644
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -4,6 +4,7 @@
#include "components/privacy_sandbox/privacy_sandbox_settings_impl.h"
+#include <algorithm>
#include <cstddef>
#include <vector>
@@ -13,7 +14,6 @@
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_functions.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
@@ -568,11 +568,10 @@
pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
auto& pref_data = scoped_pref_update.Get();
for (auto entry : pref_data) {
- if (base::ranges::any_of(FledgeBlockToContentSettingsPatterns(entry.first),
- [&](const auto& pattern) {
- return pattern.Matches(
- top_frame_origin.GetURL());
- })) {
+ if (std::ranges::any_of(FledgeBlockToContentSettingsPatterns(entry.first),
+ [&](const auto& pattern) {
+ return pattern.Matches(top_frame_origin.GetURL());
+ })) {
return false;
}
}
diff --git a/components/query_parser/query_parser.cc b/components/query_parser/query_parser.cc
index 5a4afad..8755aa23 100644
--- a/components/query_parser/query_parser.cc
+++ b/components/query_parser/query_parser.cc
@@ -13,7 +13,6 @@
#include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
namespace query_parser {
@@ -139,7 +138,7 @@
}
bool QueryNodeWord::HasMatchIn(const QueryWordVector& words, bool exact) const {
- return base::ranges::any_of(words, [&](const auto& query_word) {
+ return std::ranges::any_of(words, [&](const auto& query_word) {
return Matches(query_word.word, exact);
});
}
@@ -403,7 +402,7 @@
bool exact) {
if (find_nodes.empty() || find_in_words.empty())
return false;
- return base::ranges::all_of(find_nodes, [&](const auto& find_node) {
+ return std::ranges::all_of(find_nodes, [&](const auto& find_node) {
return find_node->HasMatchIn(find_in_words, exact);
});
}
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 3b8e96f..89aca4b 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -12,6 +12,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <cmath>
#include <memory>
@@ -25,7 +26,6 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
#import "components/remote_cocoa/app_shim/NSToolbar+Private.h"
@@ -1738,7 +1738,7 @@
void NativeWidgetNSWindowBridge::RemoveChildWindow(
NativeWidgetNSWindowBridge* child) {
- auto location = base::ranges::find(child_windows_, child);
+ auto location = std::ranges::find(child_windows_, child);
DCHECK(location != child_windows_.end());
child_windows_.erase(location);
diff --git a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
index 9c02d1bb..7474d4f1 100644
--- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
@@ -4,9 +4,10 @@
#include "components/safe_browsing/content/browser/triggers/trigger_throttler.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
#include "base/metrics/field_trial_params.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/time/default_clock.h"
@@ -46,7 +47,7 @@
const TriggerType trigger_type,
const std::vector<TriggerTypeAndQuotaItem>& trigger_quota_list,
size_t* out_quota) {
- const auto& trigger_quota_iter = base::ranges::find(
+ const auto& trigger_quota_iter = std::ranges::find(
trigger_quota_list, trigger_type, &TriggerTypeAndQuotaItem::first);
if (trigger_quota_iter != trigger_quota_list.end()) {
*out_quota = trigger_quota_iter->second;
diff --git a/components/safe_browsing/content/renderer/threat_dom_details.cc b/components/safe_browsing/content/renderer/threat_dom_details.cc
index 169d032..520a3ef 100644
--- a/components/safe_browsing/content/renderer/threat_dom_details.cc
+++ b/components/safe_browsing/content/renderer/threat_dom_details.cc
@@ -4,6 +4,7 @@
#include "components/safe_browsing/content/renderer/threat_dom_details.h"
+#include <algorithm>
#include <map>
#include <string>
#include <unordered_set>
@@ -12,7 +13,6 @@
#include "base/functional/bind.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "components/safe_browsing/core/common/features.h"
#include "content/public/renderer/render_frame.h"
@@ -77,8 +77,8 @@
for (size_t i = 0; i < split.size(); i += 2) {
const std::string& tag_name = split[i];
const std::string& attribute = split[i + 1];
- auto item_iter = base::ranges::find(*tag_and_attributes_list, tag_name,
- &TagAndAttributesItem::tag_name);
+ auto item_iter = std::ranges::find(*tag_and_attributes_list, tag_name,
+ &TagAndAttributesItem::tag_name);
if (item_iter == tag_and_attributes_list->end()) {
TagAndAttributesItem item;
item.tag_name = tag_name;
@@ -146,7 +146,7 @@
}
// Populate the element's attributes, but only collect the ones that are
// configured in the finch study.
- const auto& tag_attribute_iter = base::ranges::find(
+ const auto& tag_attribute_iter = std::ranges::find(
tag_and_attributes_list, base::ToLowerASCII(child_node->tag_name),
&TagAndAttributesItem::tag_name);
if (tag_attribute_iter != tag_and_attributes_list.end()) {
@@ -213,7 +213,7 @@
element.HasAttribute("src")) {
return true;
}
- const auto& tag_attribute_iter = base::ranges::find(
+ const auto& tag_attribute_iter = std::ranges::find(
tag_and_attributes_list, base::ToLowerASCII(element.TagName().Ascii()),
&TagAndAttributesItem::tag_name);
if (tag_attribute_iter == tag_and_attributes_list.end()) {
diff --git a/components/safe_browsing/core/browser/db/hash_prefix_map_unittest.cc b/components/safe_browsing/core/browser/db/hash_prefix_map_unittest.cc
index 2324f7de..e5b7da4 100644
--- a/components/safe_browsing/core/browser/db/hash_prefix_map_unittest.cc
+++ b/components/safe_browsing/core/browser/db/hash_prefix_map_unittest.cc
@@ -4,11 +4,11 @@
#include "components/safe_browsing/core/browser/db/hash_prefix_map.h"
+#include <algorithm>
#include <type_traits>
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
@@ -90,7 +90,7 @@
EXPECT_EQ(map.IsValid(), APPLY_UPDATE_SUCCESS);
auto hash_files = file_format.hash_files();
- base::ranges::sort(hash_files, {}, &HashFile::prefix_size);
+ std::ranges::sort(hash_files, {}, &HashFile::prefix_size);
EXPECT_EQ(hash_files.size(), 2);
const auto& file1 = file_format.hash_files(0);
diff --git a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
index 97d60ff0..850717a0 100644
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
@@ -4,6 +4,7 @@
#include "components/safe_browsing/core/browser/db/v4_local_database_manager.h"
+#include <algorithm>
#include <utility>
#include <vector>
@@ -23,7 +24,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_tokenizer.h"
#include "base/task/sequenced_task_runner.h"
@@ -365,14 +365,14 @@
// being closed).
DCHECK(enabled_ || is_shutdown_);
auto pending_it =
- base::ranges::find(pending_checks_, client, &PendingCheck::client);
+ std::ranges::find(pending_checks_, client, &PendingCheck::client);
if (pending_it != pending_checks_.end()) {
(*pending_it)->Abandon();
RemovePendingCheck(pending_it);
}
auto queued_it =
- base::ranges::find(queued_checks_, client, &PendingCheck::client);
+ std::ranges::find(queued_checks_, client, &PendingCheck::client);
if (queued_it != queued_checks_.end()) {
queued_checks_.erase(queued_it);
}
@@ -737,7 +737,7 @@
ThreatSeverity severity = GetThreatSeverity(fhi.list_id);
SBThreatType threat_type = GetSBThreatTypeForList(fhi.list_id);
- const auto& it = base::ranges::find(full_hashes, fhi.full_hash);
+ const auto& it = std::ranges::find(full_hashes, fhi.full_hash);
CHECK(it != full_hashes.end(), base::NotFatalUntil::M130);
(*full_hash_threat_types)[it - full_hashes.begin()] = threat_type;
@@ -764,7 +764,7 @@
// Returns the SBThreatType corresponding to a given SafeBrowsing list.
SBThreatType V4LocalDatabaseManager::GetSBThreatTypeForList(
const ListIdentifier& list_id) {
- auto it = base::ranges::find(list_infos_, list_id, &ListInfo::list_id);
+ auto it = std::ranges::find(list_infos_, list_id, &ListInfo::list_id);
CHECK(list_infos_.end() != it, base::NotFatalUntil::M130);
DCHECK_NE(SBThreatType::SB_THREAT_TYPE_SAFE, it->sb_threat_type());
DCHECK_NE(SBThreatType::SB_THREAT_TYPE_UNUSED, it->sb_threat_type());
diff --git a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
index 56f2d3d5..0d12005 100644
--- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
@@ -4,6 +4,7 @@
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+#include <algorithm>
#include <string_view>
#include "base/base64.h"
@@ -11,7 +12,6 @@
#include "base/hash/sha1.h"
#include "base/metrics/histogram_functions.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -611,9 +611,9 @@
void V4ProtocolManagerUtil::GetListClientStatesFromStoreStateMap(
const std::unique_ptr<StoreStateMap>& store_state_map,
std::vector<std::string>* list_client_states) {
- base::ranges::transform(*store_state_map,
- std::back_inserter(*list_client_states),
- &StoreStateMap::value_type::second);
+ std::ranges::transform(*store_state_map,
+ std::back_inserter(*list_client_states),
+ &StoreStateMap::value_type::second);
}
} // namespace safe_browsing
diff --git a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
index ed54426..982f218 100644
--- a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
+++ b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
@@ -4,10 +4,11 @@
#include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
+#include <algorithm>
+
#include "base/json/values_util.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
@@ -464,7 +465,7 @@
return 0;
}
- return base::ranges::count_if(*timestamps, [&](const base::Value& timestamp) {
+ return std::ranges::count_if(*timestamps, [&](const base::Value& timestamp) {
return PrefValueToTime(timestamp) > since_time;
});
}
diff --git a/components/safe_browsing/core/common/utils.cc b/components/safe_browsing/core/common/utils.cc
index e4265ad..331f439 100644
--- a/components/safe_browsing/core/common/utils.cc
+++ b/components/safe_browsing/core/common/utils.cc
@@ -4,10 +4,11 @@
#include "components/safe_browsing/core/common/utils.h"
+#include <algorithm>
+
#include "base/feature_list.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
@@ -137,7 +138,7 @@
const std::string hostname = url.host();
// There is no reason to send URLs with very short or single-label hosts.
// The Safe Browsing server does not check them.
- if (hostname.size() < 4 || base::ranges::count(hostname, '.') < 1) {
+ if (hostname.size() < 4 || std::ranges::count(hostname, '.') < 1) {
return false;
}
diff --git a/components/safe_search_api/url_checker_unittest.cc b/components/safe_search_api/url_checker_unittest.cc
index 3b2737d..ba42d0a 100644
--- a/components/safe_search_api/url_checker_unittest.cc
+++ b/components/safe_search_api/url_checker_unittest.cc
@@ -18,7 +18,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
#include "components/safe_search_api/fake_url_checker_client.h"
@@ -61,7 +60,7 @@
auto Recorded(const std::map<CacheAccessStatus, int>& expected) {
std::vector<base::Bucket> buckets_array;
- base::ranges::transform(
+ std::ranges::transform(
expected, std::back_inserter(buckets_array),
[](auto& entry) { return base::Bucket(entry.first, entry.second); });
return base::BucketsInclude(buckets_array);
diff --git a/components/saved_tab_groups/internal/saved_tab_group_sync_bridge.cc b/components/saved_tab_groups/internal/saved_tab_group_sync_bridge.cc
index 7e2c0122..9f69039 100644
--- a/components/saved_tab_groups/internal/saved_tab_group_sync_bridge.cc
+++ b/components/saved_tab_groups/internal/saved_tab_group_sync_bridge.cc
@@ -15,7 +15,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback_forward.h"
#include "base/functional/callback_helpers.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
@@ -123,7 +122,7 @@
size_t CalculateIndexOfGroup(const std::vector<const SavedTabGroup*>& groups,
const base::Uuid& group_id) {
auto iter =
- base::ranges::find_if(groups, [&group_id](const SavedTabGroup* group) {
+ std::ranges::find_if(groups, [&group_id](const SavedTabGroup* group) {
return group->saved_guid() == group_id;
});
CHECK(iter != groups.end());
diff --git a/components/saved_tab_groups/internal/saved_tab_group_sync_bridge_unittest.cc b/components/saved_tab_groups/internal/saved_tab_group_sync_bridge_unittest.cc
index 5faf20a..52b1c63 100644
--- a/components/saved_tab_groups/internal/saved_tab_group_sync_bridge_unittest.cc
+++ b/components/saved_tab_groups/internal/saved_tab_group_sync_bridge_unittest.cc
@@ -1015,11 +1015,11 @@
const std::vector<proto::SavedTabGroupData>& tabs_missing_groups =
bridge_->GetTabsMissingGroupsForTesting();
- auto it_1 = base::ranges::find_if(
+ auto it_1 = std::ranges::find_if(
tabs_missing_groups, [&](proto::SavedTabGroupData data) {
return data.specifics().guid() == tab_1_guid.AsLowercaseString();
});
- auto it_2 = base::ranges::find_if(
+ auto it_2 = std::ranges::find_if(
tabs_missing_groups, [&](proto::SavedTabGroupData data) {
return data.specifics().guid() == tab_2_guid.AsLowercaseString();
});
diff --git a/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.cc b/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.cc
index 330c579..81ff6c2 100644
--- a/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.cc
+++ b/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.cc
@@ -314,7 +314,7 @@
void SortStoredEntriesByUniquePosition(
std::vector<proto::SharedTabGroupData>& stored_entries,
const syncer::EntityMetadataMap& sync_metadata) {
- base::ranges::stable_sort(
+ std::ranges::stable_sort(
stored_entries, [&sync_metadata](const proto::SharedTabGroupData& left,
const proto::SharedTabGroupData& right) {
// Tabs are sorted before groups.
@@ -540,7 +540,7 @@
// unique position, they are placed to the end in an unspecified order.
void SortByUniquePositionFromRightToLeft(
std::vector<std::unique_ptr<syncer::EntityChange>>& tab_changes) {
- base::ranges::sort(tab_changes, &ReversedUniquePositionComparison);
+ std::ranges::sort(tab_changes, &ReversedUniquePositionComparison);
}
} // namespace
diff --git a/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest.cc b/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest.cc
index 7903cc9..807ca2f 100644
--- a/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest.cc
+++ b/components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest.cc
@@ -4,6 +4,7 @@
#include "components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge.h"
+#include <algorithm>
#include <array>
#include <initializer_list>
#include <memory>
@@ -12,7 +13,6 @@
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ref.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/test/bind.h"
diff --git a/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc b/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc
index a7789ec..2a658e0 100644
--- a/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc
+++ b/components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc
@@ -2162,7 +2162,7 @@
TEST_F(PinningTabGroupSyncServiceTest, UpdateGroupPositionIndex) {
auto get_index = [&](const LocalTabGroupID& local_id) -> int {
std::vector<SavedTabGroup> groups = tab_group_sync_service_->GetAllGroups();
- auto it = base::ranges::find_if(groups, [&](const SavedTabGroup& group) {
+ auto it = std::ranges::find_if(groups, [&](const SavedTabGroup& group) {
return group.local_group_id() == local_id;
});
diff --git a/components/saved_tab_groups/public/saved_tab_group.cc b/components/saved_tab_groups/public/saved_tab_group.cc
index ec47002f..08be0416 100644
--- a/components/saved_tab_groups/public/saved_tab_group.cc
+++ b/components/saved_tab_groups/public/saved_tab_group.cc
@@ -5,14 +5,13 @@
#include "components/saved_tab_groups/public/saved_tab_group.h"
#include <algorithm>
+#include <functional>
#include <optional>
#include <string>
#include <vector>
#include "base/metrics/histogram_functions.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
-#include "base/ranges/functional.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/uuid.h"
@@ -135,7 +134,7 @@
std::optional<int> SavedTabGroup::GetIndexOfTab(
const base::Uuid& saved_tab_guid) const {
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
saved_tabs(), [saved_tab_guid](const SavedTabGroupTab& tab) {
return tab.saved_tab_guid() == saved_tab_guid;
});
@@ -147,10 +146,10 @@
std::optional<int> SavedTabGroup::GetIndexOfTab(
const LocalTabID& local_tab_id) const {
- auto it = base::ranges::find_if(saved_tabs(),
- [local_tab_id](const SavedTabGroupTab& tab) {
- return tab.local_tab_id() == local_tab_id;
- });
+ auto it = std::ranges::find_if(saved_tabs(),
+ [local_tab_id](const SavedTabGroupTab& tab) {
+ return tab.local_tab_id() == local_tab_id;
+ });
if (it != saved_tabs().end()) {
return it - saved_tabs().begin();
}
@@ -300,8 +299,8 @@
if (last_removed_tabs_metadata_.size() > kMaxLastRemovedTabsMetadata) {
// Erase only one minimal element because it should be the case in
// practice.
- last_removed_tabs_metadata_.erase(base::ranges::min_element(
- last_removed_tabs_metadata_, base::ranges::less(),
+ last_removed_tabs_metadata_.erase(std::ranges::min_element(
+ last_removed_tabs_metadata_, std::ranges::less(),
[](const auto& guid_and_metadata) {
return guid_and_metadata.second.removal_time;
}));
diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
index 3404eaa..8f3eb71 100644
--- a/components/search_engines/android/template_url_service_android.cc
+++ b/components/search_engines/android/template_url_service_android.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <string>
#include <vector>
@@ -19,7 +20,6 @@
#include "base/metrics/field_trial_params.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/google/core/common/google_util.h"
@@ -413,7 +413,7 @@
template_url_service_->GetTemplateURLs();
TemplateURL* existing_play_api_turl = nullptr;
auto found =
- base::ranges::find_if(template_urls, &TemplateURL::created_from_play_api);
+ std::ranges::find_if(template_urls, &TemplateURL::created_from_play_api);
if (found != template_urls.cend()) {
// Migrate old Play API database entries that were incorrectly marked as
// safe_for_autoreplace() before M89.
@@ -473,7 +473,7 @@
// Clean up duplication between a Play API template URL and a corresponding
// prepopulated template URL.
auto play_api_it =
- base::ranges::find_if(template_urls, &TemplateURL::created_from_play_api);
+ std::ranges::find_if(template_urls, &TemplateURL::created_from_play_api);
TemplateURL* play_api_turl =
play_api_it != template_urls.end() ? *play_api_it : nullptr;
diff --git a/components/search_engines/default_search_manager_unittest.cc b/components/search_engines/default_search_manager_unittest.cc
index 7f60577..39974f277 100644
--- a/components/search_engines/default_search_manager_unittest.cc
+++ b/components/search_engines/default_search_manager_unittest.cc
@@ -460,7 +460,7 @@
auto all_engines = TemplateURLPrepopulateData::GetPrepopulatedEngines(
pref_service(), search_engine_choice_service());
const auto& builtin_engine =
- *base::ranges::find_if(all_engines, [](const auto& engine) {
+ *std::ranges::find_if(all_engines, [](const auto& engine) {
GURL url(engine->url());
return url.is_valid() && url.host_piece() == "emea.search.yahoo.com";
});
diff --git a/components/search_engines/enterprise/site_search_policy_handler.cc b/components/search_engines/enterprise/site_search_policy_handler.cc
index b8337012..f112123 100644
--- a/components/search_engines/enterprise/site_search_policy_handler.cc
+++ b/components/search_engines/enterprise/site_search_policy_handler.cc
@@ -4,9 +4,10 @@
#include "components/search_engines/enterprise/site_search_policy_handler.h"
+#include <algorithm>
+
#include "base/containers/flat_set.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
@@ -150,7 +151,7 @@
return false;
}
- int num_featured = base::ranges::count_if(
+ int num_featured = std::ranges::count_if(
site_search_providers, [](const base::Value& provider) {
return provider.GetDict().FindBool(kFeatured).value_or(false);
});
diff --git a/components/search_engines/reconciling_template_url_data_holder.cc b/components/search_engines/reconciling_template_url_data_holder.cc
index 04e0d34..5e87d0f 100644
--- a/components/search_engines/reconciling_template_url_data_holder.cc
+++ b/components/search_engines/reconciling_template_url_data_holder.cc
@@ -63,7 +63,7 @@
pref_service_, search_engine_choice_service_);
auto engine_iter =
- base::ranges::find(prepopulated_urls, keyword, &TemplateURLData::keyword);
+ std::ranges::find(prepopulated_urls, keyword, &TemplateURLData::keyword);
std::unique_ptr<TemplateURLData> result;
if (engine_iter != prepopulated_urls.end()) {
@@ -88,8 +88,8 @@
TemplateURLPrepopulateData::GetPrepopulatedEngines(
pref_service_, search_engine_choice_service_);
- auto engine_iter = base::ranges::find(prepopulated_urls, prepopulate_id,
- &TemplateURLData::prepopulate_id);
+ auto engine_iter = std::ranges::find(prepopulated_urls, prepopulate_id,
+ &TemplateURLData::prepopulate_id);
std::unique_ptr<TemplateURLData> result;
if (engine_iter != prepopulated_urls.end()) {
diff --git a/components/search_engines/search_host_to_urls_map.cc b/components/search_engines/search_host_to_urls_map.cc
index 2a27614..10ab761 100644
--- a/components/search_engines/search_host_to_urls_map.cc
+++ b/components/search_engines/search_host_to_urls_map.cc
@@ -4,10 +4,10 @@
#include "components/search_engines/search_host_to_urls_map.h"
+#include <algorithm>
#include <memory>
#include <string_view>
-#include "base/ranges/algorithm.h"
#include "components/search_engines/template_url.h"
SearchHostToURLsMap::SearchHostToURLsMap()
@@ -44,7 +44,7 @@
DCHECK_NE(TemplateURL::OMNIBOX_API_EXTENSION, template_url->type());
// A given TemplateURL only occurs once in the map.
- auto set_with_url = base::ranges::find_if(
+ auto set_with_url = std::ranges::find_if(
host_to_urls_map_,
[&](std::pair<const std::string, TemplateURLSet>& entry) {
return entry.second.erase(template_url);
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 7b7a0d4..b590bc4 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -4,6 +4,7 @@
#include "components/search_engines/template_url.h"
+#include <algorithm>
#include <string>
#include <string_view>
#include <tuple>
@@ -24,7 +25,6 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
@@ -609,11 +609,10 @@
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
- return base::ranges::any_of(
- replacements_, [](const Replacement& replacement) {
- return replacement.type == GOOGLE_BASE_URL ||
- replacement.type == GOOGLE_BASE_SUGGEST_URL;
- });
+ return std::ranges::any_of(replacements_, [](const Replacement& replacement) {
+ return replacement.type == GOOGLE_BASE_URL ||
+ replacement.type == GOOGLE_BASE_SUGGEST_URL;
+ });
}
bool TemplateURLRef::ExtractSearchTermsFromURL(
@@ -1068,7 +1067,7 @@
bool is_in_query = true;
auto search_terms =
- base::ranges::find(replacements_, SEARCH_TERMS, &Replacement::type);
+ std::ranges::find(replacements_, SEARCH_TERMS, &Replacement::type);
if (search_terms != replacements_.end()) {
std::u16string::size_type query_start = parsed_url_.find('?');
@@ -1766,10 +1765,11 @@
bool TemplateURL::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
- if (base::ranges::any_of(url_refs_, [&](const TemplateURLRef& ref) {
+ if (std::ranges::any_of(url_refs_, [&](const TemplateURLRef& ref) {
return ref.HasGoogleBaseURLs(search_terms_data);
- }))
+ })) {
return true;
+ }
return suggestions_url_ref_.HasGoogleBaseURLs(search_terms_data) ||
image_url_ref_.HasGoogleBaseURLs(search_terms_data) ||
diff --git a/components/search_engines/template_url_fetcher.cc b/components/search_engines/template_url_fetcher.cc
index 2aaeb94..dcf12b4 100644
--- a/components/search_engines/template_url_fetcher.cc
+++ b/components/search_engines/template_url_fetcher.cc
@@ -4,11 +4,12 @@
#include "components/search_engines/template_url_fetcher.h"
+#include <algorithm>
+
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -278,8 +279,8 @@
}
void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
- auto i = base::ranges::find(requests_, request,
- &std::unique_ptr<RequestDelegate>::get);
+ auto i = std::ranges::find(requests_, request,
+ &std::unique_ptr<RequestDelegate>::get);
CHECK(i != requests_.end(), base::NotFatalUntil::M130);
requests_.erase(i);
}
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index ac33f41..1d61377 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -16,7 +16,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/not_fatal_until.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/country_codes/country_codes.h"
#include "components/pref_registry/pref_registry_syncable.h"
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 9261bed..6a4d0a9 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -37,7 +37,6 @@
#include "base/notreached.h"
#include "base/observer_list.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -1043,8 +1042,8 @@
// 1.B) We can only have 1 Play API engine at a time. we have to remove the
// old one, if it exits. If it's the current default, we'll have to remove it
// first.
- auto found = base::ranges::find_if(template_urls_,
- &TemplateURL::created_from_play_api);
+ auto found =
+ std::ranges::find_if(template_urls_, &TemplateURL::created_from_play_api);
if (found != template_urls_.cend()) {
// There is already an old Play API engine. To proceed we'll need to remove
// it.
@@ -1209,7 +1208,7 @@
}
// Find the TemplateURL matching the data retrieved.
- auto iter = base::ranges::find_if(
+ auto iter = std::ranges::find_if(
template_urls_, [this, &next_search](const auto& turl_to_check) {
return TemplateURL::MatchesData(turl_to_check.get(), next_search.get(),
search_terms_data());
@@ -2322,7 +2321,7 @@
return true;
}
- return base::ranges::all_of(*urls, [](const TemplateURL* turl) {
+ return std::ranges::all_of(*urls, [](const TemplateURL* turl) {
return turl->safe_for_autoreplace();
});
}
@@ -2635,7 +2634,7 @@
LogSearchPolicyConflict(policy_search_engines);
base::flat_set<std::u16string> new_keywords;
- base::ranges::transform(
+ std::ranges::transform(
policy_search_engines, std::inserter(new_keywords, new_keywords.begin()),
[](const std::unique_ptr<TemplateURL>& turl) { return turl->keyword(); });
@@ -2659,10 +2658,10 @@
keywords_to_remove.insert(keyword);
}
}
- base::ranges::for_each(keywords_to_remove,
- [this](const std::u16string& keyword) {
- Remove(enterprise_search_keyword_to_turl_[keyword]);
- });
+ std::ranges::for_each(keywords_to_remove,
+ [this](const std::u16string& keyword) {
+ Remove(enterprise_search_keyword_to_turl_[keyword]);
+ });
// Either add new site search entries or update existing ones if necessary.
for (auto& search_engine : policy_search_engines) {
@@ -2864,7 +2863,7 @@
local_duplicates.push_back(local_turl);
}
}
- base::ranges::sort(local_duplicates, [&](const auto& a, const auto& b) {
+ std::ranges::sort(local_duplicates, [&](const auto& a, const auto& b) {
return a->IsBetterThanConflictingEngine(b);
});
for (TemplateURL* conflicting_turl : local_duplicates) {
diff --git a/components/search_engines/util.cc b/components/search_engines/util.cc
index a7b1b3d9..5d8c2d5 100644
--- a/components/search_engines/util.cc
+++ b/components/search_engines/util.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <limits>
#include <map>
#include <set>
@@ -18,7 +19,6 @@
#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/country_codes/country_codes.h"
#include "components/prefs/pref_service.h"
@@ -658,5 +658,5 @@
TemplateURLService::OwnedTemplateURLVector::iterator FindTemplateURL(
TemplateURLService::OwnedTemplateURLVector* urls,
const TemplateURL* url) {
- return base::ranges::find(*urls, url, &std::unique_ptr<TemplateURL>::get);
+ return std::ranges::find(*urls, url, &std::unique_ptr<TemplateURL>::get);
}
diff --git a/components/security_interstitials/core/https_only_mode_enforcelist.cc b/components/security_interstitials/core/https_only_mode_enforcelist.cc
index 3a996d6b..a6e4bd9 100644
--- a/components/security_interstitials/core/https_only_mode_enforcelist.cc
+++ b/components/security_interstitials/core/https_only_mode_enforcelist.cc
@@ -184,7 +184,7 @@
host_content_settings_map_->GetSettingsForOneType(
ContentSettingsType::HTTPS_ENFORCED);
size_t accumulated_host_count = output.size();
- size_t current_host_count = base::ranges::count_if(
+ size_t current_host_count = std::ranges::count_if(
output, [](const ContentSettingPatternSource setting) {
if (!setting.setting_value.is_dict()) {
return false;
diff --git a/components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher_unittest.cc b/components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher_unittest.cc
index 891dacf..fcf0726b 100644
--- a/components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher_unittest.cc
+++ b/components/segmentation_platform/embedder/input_delegate/tab_rank_dispatcher_unittest.cc
@@ -100,10 +100,10 @@
std::vector<raw_ptr<const sync_sessions::SyncedSession,
VectorExperimental>>* sessions) override {
*sessions = foreign_sessions_;
- base::ranges::sort(*sessions, std::greater(),
- [](const sync_sessions::SyncedSession* session) {
- return session->GetModifiedTime();
- });
+ std::ranges::sort(*sessions, std::greater(),
+ [](const sync_sessions::SyncedSession* session) {
+ return session->GetModifiedTime();
+ });
return !sessions->empty();
}
diff --git a/components/segmentation_platform/embedder/input_delegate/tab_session_source_unittest.cc b/components/segmentation_platform/embedder/input_delegate/tab_session_source_unittest.cc
index ee103af..5edf7e6 100644
--- a/components/segmentation_platform/embedder/input_delegate/tab_session_source_unittest.cc
+++ b/components/segmentation_platform/embedder/input_delegate/tab_session_source_unittest.cc
@@ -87,10 +87,10 @@
std::vector<raw_ptr<const sync_sessions::SyncedSession,
VectorExperimental>>* sessions) override {
*sessions = foreign_sessions_;
- base::ranges::sort(*sessions, std::greater(),
- [](const sync_sessions::SyncedSession* session) {
- return session->GetModifiedTime();
- });
+ std::ranges::sort(*sessions, std::greater(),
+ [](const sync_sessions::SyncedSession* session) {
+ return session->GetModifiedTime();
+ });
return !sessions->empty();
}
diff --git a/components/segmentation_platform/internal/metadata/metadata_utils.cc b/components/segmentation_platform/internal/metadata/metadata_utils.cc
index 61fdbbed..92170740 100644
--- a/components/segmentation_platform/internal/metadata/metadata_utils.cc
+++ b/components/segmentation_platform/internal/metadata/metadata_utils.cc
@@ -6,10 +6,11 @@
#include <inttypes.h>
+#include <algorithm>
+
#include "base/metrics/metrics_hashes.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
@@ -186,7 +187,7 @@
total_tensor_length += bind_value.value().tensor_length();
}
- if (total_tensor_length != base::ranges::count(feature.sql(), '?')) {
+ if (total_tensor_length != std::ranges::count(feature.sql(), '?')) {
return ValidationResult::kFeatureBindValuesInvalid;
}
diff --git a/components/services/app_service/public/cpp/intent.cc b/components/services/app_service/public/cpp/intent.cc
index 486bef0..c499e39 100644
--- a/components/services/app_service/public/cpp/intent.cc
+++ b/components/services/app_service/public/cpp/intent.cc
@@ -4,9 +4,10 @@
#include "components/services/app_service/public/cpp/intent.h"
+#include <algorithm>
+
#include "base/files/safe_base_name.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/services/app_service/public/cpp/app_types.h"
#include "components/services/app_service/public/cpp/intent_util.h"
@@ -68,10 +69,10 @@
bool IntentFile::MatchAnyConditionValue(
const std::vector<ConditionValuePtr>& condition_values) {
- return base::ranges::any_of(condition_values,
- [this](const ConditionValuePtr& condition_value) {
- return MatchConditionValue(condition_value);
- });
+ return std::ranges::any_of(condition_values,
+ [this](const ConditionValuePtr& condition_value) {
+ return MatchConditionValue(condition_value);
+ });
}
Intent::Intent(const std::string& action) : action(action) {}
@@ -179,7 +180,7 @@
std::optional<std::string> port =
apps_util::AuthorityView::PortToString(url.value());
- return base::ranges::any_of(
+ return std::ranges::any_of(
condition->condition_values,
[this, &port](const ConditionValuePtr& condition_value) {
apps_util::AuthorityView match_authority =
@@ -205,7 +206,7 @@
DCHECK_EQ(condition->condition_type, ConditionType::kFile);
return !files.empty() &&
- base::ranges::all_of(files, [&condition](const IntentFilePtr& file) {
+ std::ranges::all_of(files, [&condition](const IntentFilePtr& file) {
return file->MatchAnyConditionValue(condition->condition_values);
});
}
@@ -222,11 +223,11 @@
std::optional<std::string> value_to_match =
GetIntentConditionValueByType(condition->condition_type);
return value_to_match.has_value() &&
- base::ranges::any_of(condition->condition_values,
- [&value_to_match](const auto& condition_value) {
- return apps_util::ConditionValueMatches(
- value_to_match.value(), condition_value);
- });
+ std::ranges::any_of(condition->condition_values,
+ [&value_to_match](const auto& condition_value) {
+ return apps_util::ConditionValueMatches(
+ value_to_match.value(), condition_value);
+ });
}
bool Intent::MatchFilter(const IntentFilterPtr& filter) {
diff --git a/components/services/app_service/public/cpp/intent_util.cc b/components/services/app_service/public/cpp/intent_util.cc
index 61730080..585fcb6b 100644
--- a/components/services/app_service/public/cpp/intent_util.cc
+++ b/components/services/app_service/public/cpp/intent_util.cc
@@ -4,6 +4,7 @@
#include "components/services/app_service/public/cpp/intent_util.h"
+#include <algorithm>
#include <optional>
#include <string>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/files/file_path.h"
#include "base/functional/bind.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/services/app_service/public/cpp/preferred_apps_impl.cc b/components/services/app_service/public/cpp/preferred_apps_impl.cc
index 0e38dcb5..f98954f 100644
--- a/components/services/app_service/public/cpp/preferred_apps_impl.cc
+++ b/components/services/app_service/public/cpp/preferred_apps_impl.cc
@@ -4,6 +4,7 @@
#include "components/services/app_service/public/cpp/preferred_apps_impl.h"
+#include <algorithm>
#include <iterator>
#include <utility>
@@ -13,7 +14,6 @@
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/sequence_checker.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
@@ -255,7 +255,7 @@
for (auto& replaced_app_and_filters : replaced_apps) {
const std::string& removed_app_id = replaced_app_and_filters.first;
bool first_removal_for_app = !base::Contains(removed, app_id);
- bool did_replace_supported_link = base::ranges::any_of(
+ bool did_replace_supported_link = std::ranges::any_of(
replaced_app_and_filters.second,
[&removed_app_id](const auto& filter) {
return apps_util::IsSupportedLinkForApp(removed_app_id, filter);
diff --git a/components/services/app_service/public/cpp/preferred_apps_list.cc b/components/services/app_service/public/cpp/preferred_apps_list.cc
index ab4206b..d831534 100644
--- a/components/services/app_service/public/cpp/preferred_apps_list.cc
+++ b/components/services/app_service/public/cpp/preferred_apps_list.cc
@@ -4,11 +4,11 @@
#include "components/services/app_service/public/cpp/preferred_apps_list.h"
+#include <algorithm>
#include <utility>
#include "base/containers/contains.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "components/services/app_service/public/cpp/intent_filter_util.h"
#include "components/services/app_service/public/cpp/intent_util.h"
@@ -172,7 +172,7 @@
}
bool has_supported_link =
- base::ranges::any_of(filters, [&app_id](const auto& filter) {
+ std::ranges::any_of(filters, [&app_id](const auto& filter) {
return apps_util::IsSupportedLinkForApp(app_id, filter);
});
diff --git a/components/services/font_data/font_data_service_impl.cc b/components/services/font_data/font_data_service_impl.cc
index 4a2ea88..b208bb4 100644
--- a/components/services/font_data/font_data_service_impl.cc
+++ b/components/services/font_data/font_data_service_impl.cc
@@ -4,12 +4,12 @@
#include "components/services/font_data/font_data_service_impl.h"
+#include <algorithm>
#include <utility>
#include "base/check.h"
#include "base/containers/heap_array.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/task/thread_pool.h"
#include "base/trace_event/trace_event.h"
#include "skia/ext/font_utils.h"
@@ -168,7 +168,7 @@
result->variation_position = mojom::VariationPosition::New();
result->variation_position->coordinates.reserve(coordinate_list.size());
result->variation_position->coordinateCount = axis_count;
- base::ranges::transform(
+ std::ranges::transform(
coordinate_list,
std::back_inserter(result->variation_position->coordinates),
[](const SkFontArguments::VariationPosition::Coordinate& coordinate) {
diff --git a/components/services/paint_preview_compositor/paint_preview_compositor_impl.cc b/components/services/paint_preview_compositor/paint_preview_compositor_impl.cc
index 4a21b8f9..cd09ff6 100644
--- a/components/services/paint_preview_compositor/paint_preview_compositor_impl.cc
+++ b/components/services/paint_preview_compositor/paint_preview_compositor_impl.cc
@@ -10,7 +10,6 @@
#include <utility>
#include "base/memory/memory_pressure_listener.h"
-#include "base/ranges/algorithm.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
#include "base/trace_event/common/trace_event_common.h"
@@ -470,17 +469,17 @@
// Try and find the subframe's proto based on its embedding token.
auto& subframes = proto.subframes();
auto subframe_proto_it =
- base::ranges::find(subframes, subframe_embedding_token,
- [](const PaintPreviewFrameProto& frame_proto) {
- std::optional<base::UnguessableToken> token =
- base::UnguessableToken::Deserialize(
- frame_proto.embedding_token_high(),
- frame_proto.embedding_token_low());
- if (!token.has_value()) {
- return base::UnguessableToken::Create();
- }
- return token.value();
- });
+ std::ranges::find(subframes, subframe_embedding_token,
+ [](const PaintPreviewFrameProto& frame_proto) {
+ std::optional<base::UnguessableToken> token =
+ base::UnguessableToken::Deserialize(
+ frame_proto.embedding_token_high(),
+ frame_proto.embedding_token_low());
+ if (!token.has_value()) {
+ return base::UnguessableToken::Create();
+ }
+ return token.value();
+ });
if (subframe_proto_it == subframes.end()) {
DVLOG(1) << "Frame embeds subframe that does not exist: "
<< subframe_embedding_token;
diff --git a/components/services/print_compositor/print_compositor_impl.cc b/components/services/print_compositor/print_compositor_impl.cc
index 33dadae..4ec2e6c 100644
--- a/components/services/print_compositor/print_compositor_impl.cc
+++ b/components/services/print_compositor/print_compositor_impl.cc
@@ -4,13 +4,13 @@
#include "components/services/print_compositor/print_compositor_impl.h"
+#include <algorithm>
#include <tuple>
#include <utility>
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/memory/discardable_memory.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
@@ -311,8 +311,8 @@
// update with this frame's pending list.
auto& pending_list = request->pending_subframes;
if (pending_list.erase(frame_guid)) {
- base::ranges::copy(pending_subframes,
- std::inserter(pending_list, pending_list.end()));
+ std::ranges::copy(pending_subframes,
+ std::inserter(pending_list, pending_list.end()));
}
// If the request still has pending frames, or isn't at the front of the
diff --git a/components/services/storage/dom_storage/local_storage_impl.cc b/components/services/storage/dom_storage/local_storage_impl.cc
index ba90fc06..e615599f 100644
--- a/components/services/storage/dom_storage/local_storage_impl.cc
+++ b/components/services/storage/dom_storage/local_storage_impl.cc
@@ -443,7 +443,7 @@
return;
}
- std::move(callback).Run(base::ranges::any_of(areas_, [](const auto& iter) {
+ std::move(callback).Run(std::ranges::any_of(areas_, [](const auto& iter) {
return iter.second->storage_area()->has_changes_to_commit();
}));
}
diff --git a/components/services/storage/dom_storage/session_storage_namespace_impl.cc b/components/services/storage/dom_storage/session_storage_namespace_impl.cc
index 5735638..0712151 100644
--- a/components/services/storage/dom_storage/session_storage_namespace_impl.cc
+++ b/components/services/storage/dom_storage/session_storage_namespace_impl.cc
@@ -4,12 +4,12 @@
#include "components/services/storage/dom_storage/session_storage_namespace_impl.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include "base/functional/bind.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
namespace storage {
@@ -93,7 +93,7 @@
state_ = State::kPopulated;
pending_population_from_parent_namespace_.clear();
namespace_entry_ = namespace_metadata;
- base::ranges::transform(
+ std::ranges::transform(
areas_to_clone,
std::inserter(storage_key_areas_, storage_key_areas_.begin()),
[namespace_metadata](const auto& source) {
diff --git a/components/services/storage/indexed_db/locks/partitioned_lock_manager.cc b/components/services/storage/indexed_db/locks/partitioned_lock_manager.cc
index 9f4c722..e0dbd56 100644
--- a/components/services/storage/indexed_db/locks/partitioned_lock_manager.cc
+++ b/components/services/storage/indexed_db/locks/partitioned_lock_manager.cc
@@ -4,6 +4,7 @@
#include "components/services/storage/indexed_db/locks/partitioned_lock_manager.h"
+#include <algorithm>
#include <cstddef>
#include <list>
#include <memory>
@@ -18,7 +19,6 @@
#include "base/location.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
#include "components/services/storage/indexed_db/locks/partitioned_lock.h"
@@ -108,9 +108,9 @@
bool PartitionedLockManager::RequestsAreOverlapping(
const base::flat_set<PartitionedLockRequest>& requests_a,
const base::flat_set<PartitionedLockRequest>& requests_b) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
requests_a, [&requests_b](const PartitionedLockRequest& lock_request_a) {
- return base::ranges::any_of(
+ return std::ranges::any_of(
requests_b,
[&lock_request_a](const PartitionedLockRequest& lock_request_b) {
return (lock_request_a.type == LockType::kExclusive ||
@@ -127,15 +127,15 @@
// Do nothing if we can't grant *every* lock. Note that it's important this is
// `any_of` and not `all_of` (with an inverted predicate) in order to support
// empty lock requests.
- if (base::ranges::any_of(requests_iter->lock_requests,
- [this](PartitionedLockRequest& request) {
- auto it = locks_.find(request.lock_id);
- if (it == locks_.end()) {
- return false;
- }
+ if (std::ranges::any_of(requests_iter->lock_requests,
+ [this](PartitionedLockRequest& request) {
+ auto it = locks_.find(request.lock_id);
+ if (it == locks_.end()) {
+ return false;
+ }
- return !it->second.CanBeAcquired(request.type);
- })) {
+ return !it->second.CanBeAcquired(request.type);
+ })) {
return ++requests_iter;
}
@@ -246,7 +246,7 @@
for (auto iter = request_queue_.begin(); iter != request_queue_.end();) {
bool exclusive = false;
- if (!base::ranges::any_of(
+ if (!std::ranges::any_of(
iter->lock_requests, [&released_lock_id, &exclusive](
PartitionedLockRequest& lock_request) {
// We found an interesting lock in the given request. Is the
diff --git a/components/services/storage/public/cpp/buckets/bucket_info.cc b/components/services/storage/public/cpp/buckets/bucket_info.cc
index 785e53b..2c70d87 100644
--- a/components/services/storage/public/cpp/buckets/bucket_info.cc
+++ b/components/services/storage/public/cpp/buckets/bucket_info.cc
@@ -4,7 +4,7 @@
#include "components/services/storage/public/cpp/buckets/bucket_info.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
namespace storage {
@@ -48,8 +48,8 @@
std::set<BucketLocator> COMPONENT_EXPORT(STORAGE_SERVICE_BUCKETS_SUPPORT)
BucketInfosToBucketLocators(const std::set<BucketInfo>& bucket_infos) {
std::set<BucketLocator> result;
- base::ranges::transform(bucket_infos, std::inserter(result, result.begin()),
- &BucketInfo::ToBucketLocator);
+ std::ranges::transform(bucket_infos, std::inserter(result, result.begin()),
+ &BucketInfo::ToBucketLocator);
return result;
}
diff --git a/components/sessions/core/command_storage_manager.cc b/components/sessions/core/command_storage_manager.cc
index a4059c49..0ab7c9d 100644
--- a/components/sessions/core/command_storage_manager.cc
+++ b/components/sessions/core/command_storage_manager.cc
@@ -4,13 +4,13 @@
#include "components/sessions/core/command_storage_manager.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/scoped_refptr.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
@@ -99,8 +99,8 @@
}
void CommandStorageManager::EraseCommand(SessionCommand* old_command) {
- auto it = base::ranges::find(pending_commands_, old_command,
- &std::unique_ptr<SessionCommand>::get);
+ auto it = std::ranges::find(pending_commands_, old_command,
+ &std::unique_ptr<SessionCommand>::get);
CHECK(it != pending_commands_.end());
pending_commands_.erase(it);
DCHECK_GT(commands_since_reset_, 0);
@@ -110,8 +110,8 @@
void CommandStorageManager::SwapCommand(
SessionCommand* old_command,
std::unique_ptr<SessionCommand> new_command) {
- auto it = base::ranges::find(pending_commands_, old_command,
- &std::unique_ptr<SessionCommand>::get);
+ auto it = std::ranges::find(pending_commands_, old_command,
+ &std::unique_ptr<SessionCommand>::get);
CHECK(it != pending_commands_.end());
*it = std::move(new_command);
}
diff --git a/components/shared_highlighting/core/common/fragment_directives_utils.cc b/components/shared_highlighting/core/common/fragment_directives_utils.cc
index 04fdb46..54cdd21 100644
--- a/components/shared_highlighting/core/common/fragment_directives_utils.cc
+++ b/components/shared_highlighting/core/common/fragment_directives_utils.cc
@@ -6,12 +6,12 @@
#include <string.h>
+#include <algorithm>
#include <optional>
#include <sstream>
#include <string_view>
#include "base/json/json_writer.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
@@ -107,7 +107,7 @@
for (const std::string& directive :
base::SplitString(fragment_directive, kSelectorJoinDelimeter,
base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
- if (base::ranges::none_of(
+ if (std::ranges::none_of(
directive_parameter_names,
[&directive](std::string_view directive_parameter_name) {
return base::StartsWith(directive, directive_parameter_name);
diff --git a/components/signin/core/browser/account_investigator.cc b/components/signin/core/browser/account_investigator.cc
index 482da75c..412773d 100644
--- a/components/signin/core/browser/account_investigator.cc
+++ b/components/signin/core/browser/account_investigator.cc
@@ -4,11 +4,11 @@
#include "components/signin/core/browser/account_investigator.h"
+#include <algorithm>
#include <iterator>
#include "base/base64.h"
#include "base/hash/sha1.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
@@ -163,17 +163,17 @@
const std::vector<ListedAccount>& signed_in_accounts,
const std::vector<ListedAccount>& signed_out_accounts) {
std::vector<std::string> sorted_ids(signed_in_accounts.size());
- base::ranges::transform(signed_in_accounts, std::back_inserter(sorted_ids),
- [](const ListedAccount& account) {
- return kSignedInHashPrefix + account.id.ToString();
- });
- base::ranges::transform(signed_out_accounts, std::back_inserter(sorted_ids),
- [](const ListedAccount& account) {
- return kSignedOutHashPrefix + account.id.ToString();
- });
+ std::ranges::transform(signed_in_accounts, std::back_inserter(sorted_ids),
+ [](const ListedAccount& account) {
+ return kSignedInHashPrefix + account.id.ToString();
+ });
+ std::ranges::transform(signed_out_accounts, std::back_inserter(sorted_ids),
+ [](const ListedAccount& account) {
+ return kSignedOutHashPrefix + account.id.ToString();
+ });
std::sort(sorted_ids.begin(), sorted_ids.end());
std::ostringstream stream;
- base::ranges::copy(sorted_ids, std::ostream_iterator<std::string>(stream));
+ std::ranges::copy(sorted_ids, std::ostream_iterator<std::string>(stream));
// PrefService will slightly mangle some undisplayable characters, by encoding
// in Base64 we are sure to have all safe characters that PrefService likes.
@@ -188,10 +188,10 @@
if (signed_in_accounts.empty() && signed_out_accounts.empty()) {
return AccountRelation::EMPTY_COOKIE_JAR;
}
- if (base::ranges::any_of(signed_in_accounts,
- [&info](const ListedAccount& account) {
- return AreSame(info, account);
- })) {
+ if (std::ranges::any_of(signed_in_accounts,
+ [&info](const ListedAccount& account) {
+ return AreSame(info, account);
+ })) {
if (signed_in_accounts.size() == 1) {
return signed_out_accounts.empty()
? AccountRelation::SINGLE_SIGNED_IN_MATCH_NO_SIGNED_OUT
@@ -199,10 +199,10 @@
}
return AccountRelation::ONE_OF_SIGNED_IN_MATCH_ANY_SIGNED_OUT;
}
- if (base::ranges::any_of(signed_out_accounts,
- [&info](const ListedAccount& account) {
- return AreSame(info, account);
- })) {
+ if (std::ranges::any_of(signed_out_accounts,
+ [&info](const ListedAccount& account) {
+ return AreSame(info, account);
+ })) {
if (signed_in_accounts.empty()) {
return signed_out_accounts.size() == 1
? AccountRelation::NO_SIGNED_IN_SINGLE_SIGNED_OUT_MATCH
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
index 6613985e..0ea14718 100644
--- a/components/signin/core/browser/account_reconcilor.cc
+++ b/components/signin/core/browser/account_reconcilor.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <iterator>
#include <set>
#include <utility>
@@ -19,7 +20,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -61,8 +61,8 @@
const std::vector<gaia::ListedAccount>& accounts) {
// Ignore unverified accounts.
std::vector<gaia::ListedAccount> verified_gaia_accounts;
- base::ranges::copy_if(accounts, std::back_inserter(verified_gaia_accounts),
- &gaia::ListedAccount::verified);
+ std::ranges::copy_if(accounts, std::back_inserter(verified_gaia_accounts),
+ &gaia::ListedAccount::verified);
return verified_gaia_accounts;
}
diff --git a/components/signin/core/browser/account_reconcilor_delegate.cc b/components/signin/core/browser/account_reconcilor_delegate.cc
index 603c751..3481422 100644
--- a/components/signin/core/browser/account_reconcilor_delegate.cc
+++ b/components/signin/core/browser/account_reconcilor_delegate.cc
@@ -9,7 +9,6 @@
#include "base/containers/contains.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "google_apis/gaia/google_service_auth_error.h"
@@ -106,11 +105,11 @@
// Put first_account in first position if needed, using swap to avoid changing
// the order of existing cookies.
if (!first_account.empty()) {
- auto first_account_it = base::ranges::find(ordered_accounts, first_account);
+ auto first_account_it = std::ranges::find(ordered_accounts, first_account);
if (first_account_it == ordered_accounts.end()) {
// The first account was not already in the cookies, add it in the first
// empty spot, or at the end if there is no available spot.
- first_account_it = base::ranges::find(ordered_accounts, CoreAccountId());
+ first_account_it = std::ranges::find(ordered_accounts, CoreAccountId());
if (first_account_it == ordered_accounts.end()) {
first_account_it =
ordered_accounts.insert(first_account_it, first_account);
diff --git a/components/signin/core/browser/account_reconcilor_unittest.cc b/components/signin/core/browser/account_reconcilor_unittest.cc
index d66c8f4..c18cc4e0 100644
--- a/components/signin/core/browser/account_reconcilor_unittest.cc
+++ b/components/signin/core/browser/account_reconcilor_unittest.cc
@@ -4,6 +4,7 @@
#include "components/signin/core/browser/account_reconcilor.h"
+#include <algorithm>
#include <cstring>
#include <map>
#include <memory>
@@ -14,7 +15,6 @@
#include "base/containers/contains.h"
#include "base/feature_list.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/strings/utf_string_conversions.h"
@@ -693,7 +693,7 @@
for (Cookie& cookie : cookies_after_reconcile) {
if (base::Contains(gaia_ids, cookie.gaia_id)) {
cookie.is_valid = true;
- gaia_ids.erase(base::ranges::find(gaia_ids, cookie.gaia_id));
+ gaia_ids.erase(std::ranges::find(gaia_ids, cookie.gaia_id));
} else {
DCHECK(!cookie.is_valid);
}
diff --git a/components/signin/core/browser/dice_account_reconcilor_delegate.cc b/components/signin/core/browser/dice_account_reconcilor_delegate.cc
index 6d5c480c..a5b2dda 100644
--- a/components/signin/core/browser/dice_account_reconcilor_delegate.cc
+++ b/components/signin/core/browser/dice_account_reconcilor_delegate.cc
@@ -4,13 +4,13 @@
#include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
+#include <algorithm>
#include <vector>
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "components/prefs/pref_service.h"
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/base/signin_client.h"
@@ -116,8 +116,8 @@
auto* accounts_mutator = identity_manager_->GetAccountsMutator();
for (const CoreAccountInfo& account_info :
identity_manager_->GetAccountsWithRefreshTokens()) {
- auto it = base::ranges::find(gaia_accounts, account_info.account_id,
- &gaia::ListedAccount::id);
+ auto it = std::ranges::find(gaia_accounts, account_info.account_id,
+ &gaia::ListedAccount::id);
if (it == gaia_accounts.end() || !it->valid) {
// Account not in the cookie or the account is not valid (session
// expired) and requires the user to reauth.
@@ -170,9 +170,9 @@
std::vector<CoreAccountId> sorted_chrome_accounts(chrome_accounts);
std::sort(sorted_chrome_accounts.begin(), sorted_chrome_accounts.end());
bool missing_token =
- !base::ranges::includes(sorted_chrome_accounts, valid_gaia_accounts_ids);
+ !std::ranges::includes(sorted_chrome_accounts, valid_gaia_accounts_ids);
bool missing_cookie =
- !base::ranges::includes(valid_gaia_accounts_ids, sorted_chrome_accounts);
+ !std::ranges::includes(valid_gaia_accounts_ids, sorted_chrome_accounts);
if (missing_token && missing_cookie) {
return InconsistencyReason::kCookieTokenMismatch;
diff --git a/components/signin/core/browser/signin_header_helper.cc b/components/signin/core/browser/signin_header_helper.cc
index 1b4fd352..6b06b5f7 100644
--- a/components/signin/core/browser/signin_header_helper.cc
+++ b/components/signin/core/browser/signin_header_helper.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <algorithm>
#include <string_view>
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/string_split.h"
#include "components/google/core/common/google_util.h"
@@ -101,7 +101,7 @@
const std::string& value) {
modified_headers_->SetHeader(name, value);
- auto it = base::ranges::find(*headers_to_remove_, name);
+ auto it = std::ranges::find(*headers_to_remove_, name);
if (it != headers_to_remove_->end()) {
headers_to_remove_->erase(it);
}
diff --git a/components/signin/internal/identity_manager/account_tracker_service.cc b/components/signin/internal/identity_manager/account_tracker_service.cc
index f9e99212..e97acc1 100644
--- a/components/signin/internal/identity_manager/account_tracker_service.cc
+++ b/components/signin/internal/identity_manager/account_tracker_service.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <sstream>
#include <string>
#include <string_view>
@@ -22,7 +23,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
@@ -244,7 +244,7 @@
AccountInfo AccountTrackerService::FindAccountInfoByGaiaId(
const GaiaId& gaia_id) const {
if (!gaia_id.empty()) {
- const auto iterator = base::ranges::find(
+ const auto iterator = std::ranges::find(
accounts_, gaia_id, [](const auto& pair) { return pair.second.gaia; });
if (iterator != accounts_.end()) {
return iterator->second;
@@ -258,7 +258,7 @@
const std::string& email) const {
if (!email.empty()) {
const auto iterator =
- base::ranges::find_if(accounts_, [&email](const auto& pair) {
+ std::ranges::find_if(accounts_, [&email](const auto& pair) {
return gaia::AreEmailsSame(pair.second.email, email);
});
if (iterator != accounts_.end()) {
diff --git a/components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.cc b/components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.cc
index 621f4dd..d812353 100644
--- a/components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.cc
+++ b/components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.cc
@@ -4,13 +4,13 @@
#include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h"
+#include <algorithm>
#include <list>
#include <memory>
#include <optional>
#include <vector>
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "build/build_config.h"
#include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
@@ -150,7 +150,7 @@
FireRefreshTokenRevoked(account_id);
} else {
// Look for the account ID in the list, and if it is not present append it.
- if (base::ranges::find(account_ids_, account_id) == account_ids_.end()) {
+ if (std::ranges::find(account_ids_, account_id) == account_ids_.end()) {
account_ids_.push_back(account_id);
}
refresh_tokens_[account_id] = token;
diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
index 65c49102..a6d9a35 100644
--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <optional>
#include <queue>
#include <set>
@@ -20,7 +21,6 @@
#include "base/json/json_reader.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -913,7 +913,7 @@
// Logout or set accounts will impact the result of list accounts.
// Handle those requests first.
bool should_delay_list_accounts =
- base::ranges::any_of(requests_, [](const auto& request) {
+ std::ranges::any_of(requests_, [](const auto& request) {
return request.request_type() == GaiaCookieRequestType::LOG_OUT ||
request.request_type() == GaiaCookieRequestType::SET_ACCOUNTS;
});
diff --git a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
index 065dc2e..f14a275 100644
--- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
+++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <map>
#include <optional>
#include <string>
@@ -15,7 +16,6 @@
#include "base/memory/weak_ptr.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
@@ -282,7 +282,7 @@
}
// |this| pointer will be deleted when removed from the vector, so don't
// access any members after call to erase().
- token_service_delegate_->server_revokes_.erase(base::ranges::find(
+ token_service_delegate_->server_revokes_.erase(std::ranges::find(
token_service_delegate_->server_revokes_, this,
&std::unique_ptr<MutableProfileOAuth2TokenServiceDelegate::
RevokeServerRefreshToken>::get));
diff --git a/components/spellcheck/browser/windows_spell_checker_unittest.cc b/components/spellcheck/browser/windows_spell_checker_unittest.cc
index d3cb1b7..02776c4 100644
--- a/components/spellcheck/browser/windows_spell_checker_unittest.cc
+++ b/components/spellcheck/browser/windows_spell_checker_unittest.cc
@@ -2,15 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/spellcheck/browser/spellcheck_platform.h"
+#include "components/spellcheck/browser/windows_spell_checker.h"
#include <stddef.h>
+
+#include <algorithm>
#include <ostream>
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -20,7 +21,7 @@
#include "base/test/task_environment.h"
#include "base/win/windows_version.h"
#include "build/build_config.h"
-#include "components/spellcheck/browser/windows_spell_checker.h"
+#include "components/spellcheck/browser/spellcheck_platform.h"
#include "components/spellcheck/common/spellcheck_features.h"
#include "components/spellcheck/common/spellcheck_result.h"
#include "components/spellcheck/spellcheck_buildflags.h"
diff --git a/components/spellcheck/renderer/spellcheck.cc b/components/spellcheck/renderer/spellcheck.cc
index 8382382..268077f 100644
--- a/components/spellcheck/renderer/spellcheck.cc
+++ b/components/spellcheck/renderer/spellcheck.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <memory>
#include <string_view>
#include <utility>
@@ -17,7 +18,6 @@
#include "base/location.h"
#include "base/notreached.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "build/build_config.h"
@@ -69,7 +69,7 @@
WebVector<WebString> ConvertToWebStringFromUtf8(
const std::set<std::string>& words) {
WebVector<WebString> result(words.size());
- base::ranges::transform(words, result.begin(), [](const auto& word) {
+ std::ranges::transform(words, result.begin(), [](const auto& word) {
return WebString::FromUTF8(word);
});
return result;
@@ -495,7 +495,7 @@
}
if (!host || languages_.empty() ||
- !base::ranges::all_of(languages_, &SpellcheckLanguage::IsEnabled)) {
+ !std::ranges::all_of(languages_, &SpellcheckLanguage::IsEnabled)) {
param->completion()->DidCancelCheckingText();
} else {
WebVector<blink::WebTextCheckingResult> results;
@@ -632,7 +632,7 @@
}
size_t SpellCheck::EnabledLanguageCount() {
- return base::ranges::count_if(languages_, &SpellcheckLanguage::IsEnabled);
+ return std::ranges::count_if(languages_, &SpellcheckLanguage::IsEnabled);
}
void SpellCheck::NotifyDictionaryObservers(
@@ -643,7 +643,7 @@
}
bool SpellCheck::IsWordInSupportedScript(const std::u16string& word) const {
- return base::ranges::any_of(languages_, [word](const auto& language) {
+ return std::ranges::any_of(languages_, [word](const auto& language) {
return language->IsTextInSameScript(word);
});
}
diff --git a/components/spellcheck/renderer/spellcheck_provider.cc b/components/spellcheck/renderer/spellcheck_provider.cc
index 905eec0..d4119af 100644
--- a/components/spellcheck/renderer/spellcheck_provider.cc
+++ b/components/spellcheck/renderer/spellcheck_provider.cc
@@ -9,12 +9,12 @@
#include "components/spellcheck/renderer/spellcheck_provider.h"
+#include <algorithm>
#include <unordered_map>
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "build/build_config.h"
@@ -290,10 +290,10 @@
std::vector<std::u16string> suggestions;
spellcheck::FillSuggestions(per_language_suggestions, &suggestions);
WebVector<WebString> web_suggestions(suggestions.size());
- base::ranges::transform(suggestions, web_suggestions.begin(),
- [](const auto& suggestion) {
- return WebString::FromUTF16(suggestion);
- });
+ std::ranges::transform(suggestions, web_suggestions.begin(),
+ [](const auto& suggestion) {
+ return WebString::FromUTF16(suggestion);
+ });
*optional_suggestions = web_suggestions;
spellcheck_renderer_metrics::RecordCheckedTextLengthWithSuggestions(
base::saturated_cast<int>(word.size()));
diff --git a/components/subresource_filter/content/browser/safe_browsing_page_activation_throttle.cc b/components/subresource_filter/content/browser/safe_browsing_page_activation_throttle.cc
index 5b0f415..bcd6a10 100644
--- a/components/subresource_filter/content/browser/safe_browsing_page_activation_throttle.cc
+++ b/components/subresource_filter/content/browser/safe_browsing_page_activation_throttle.cc
@@ -4,6 +4,7 @@
#include "components/subresource_filter/content/browser/safe_browsing_page_activation_throttle.h"
+#include <algorithm>
#include <optional>
#include <sstream>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/timer/timer.h"
#include "base/trace_event/trace_event.h"
@@ -277,7 +277,7 @@
if (navigation_handle()->GetURL().SchemeIsHTTPOrHTTPS()) {
const auto& decreasing_configs =
GetEnabledConfigurations()->configs_by_decreasing_priority();
- const auto selected_config_itr = base::ranges::find_if(
+ const auto selected_config_itr = std::ranges::find_if(
decreasing_configs, [matched_list, this](const Configuration& config) {
return DoesRootFrameURLSatisfyActivationConditions(
config.activation_conditions, matched_list);
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
index 2f3c80af..0764aa5 100644
--- a/components/subresource_filter/core/browser/subresource_filter_features.cc
+++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
@@ -4,6 +4,7 @@
#include "components/subresource_filter/core/browser/subresource_filter_features.h"
+#include <algorithm>
#include <map>
#include <ostream>
#include <sstream>
@@ -15,7 +16,6 @@
#include "base/lazy_instance.h"
#include "base/metrics/field_trial_params.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -44,7 +44,7 @@
CommaSeparatedStrings& operator=(const CommaSeparatedStrings&) = delete;
bool CaseInsensitiveContains(std::string_view lowercase_key) const {
- return base::ranges::any_of(
+ return std::ranges::any_of(
pieces_, [lowercase_key](std::string_view element) {
return base::EqualsCaseInsensitiveASCII(element, lowercase_key);
});
diff --git a/components/supervised_user/core/browser/child_account_service.cc b/components/supervised_user/core/browser/child_account_service.cc
index 1dc5141..bd7ea4c 100644
--- a/components/supervised_user/core/browser/child_account_service.cc
+++ b/components/supervised_user/core/browser/child_account_service.cc
@@ -106,7 +106,7 @@
identity_manager_->GetAccountsInCookieJar();
bool primary_account_has_cookie =
accounts_in_cookie_jar_info.AreAccountsFresh() &&
- base::ranges::any_of(
+ std::ranges::any_of(
accounts_in_cookie_jar_info.GetPotentiallyInvalidSignedInAccounts(),
[primary_account_id](const gaia::ListedAccount& account) {
return account.id == primary_account_id && account.valid;
diff --git a/components/supervised_user/core/browser/supervised_user_url_filter.cc b/components/supervised_user/core/browser/supervised_user_url_filter.cc
index 849582a1..fd0bab72 100644
--- a/components/supervised_user/core/browser/supervised_user_url_filter.cc
+++ b/components/supervised_user/core/browser/supervised_user_url_filter.cc
@@ -549,7 +549,7 @@
const std::string host = url.host();
if (result != FilteringBehavior::kBlock) {
// If there is a match with Block behaviour, set the result to Block.
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
blocked_host_list_, [&host](const std::string& host_entry) {
return HostMatchesPattern(host, host_entry);
});
diff --git a/components/sync/base/unique_position.cc b/components/sync/base/unique_position.cc
index 8929ffd..02bf937 100644
--- a/components/sync/base/unique_position.cc
+++ b/components/sync/base/unique_position.cc
@@ -14,7 +14,6 @@
#include "base/hash/sha1.h"
#include "base/logging.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "components/sync/base/client_tag_hash.h"
@@ -28,7 +27,7 @@
UniquePosition::Suffix StringToSuffix(std::string_view str) {
CHECK_EQ(str.length(), UniquePosition::kSuffixLength);
UniquePosition::Suffix suffix;
- base::ranges::copy(str, suffix.begin());
+ std::ranges::copy(str, suffix.begin());
return suffix;
}
diff --git a/components/sync/base/unique_position_unittest.cc b/components/sync/base/unique_position_unittest.cc
index 9dc7c56..d5c1df5 100644
--- a/components/sync/base/unique_position_unittest.cc
+++ b/components/sync/base/unique_position_unittest.cc
@@ -15,7 +15,6 @@
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_span.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "components/sync/protocol/unique_position.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -398,7 +397,7 @@
std::string suffix_str =
base::Base64Encode(base::SHA1Hash(base::as_byte_span(input)));
UniquePosition::Suffix suffix;
- base::ranges::copy(suffix_str, suffix.begin());
+ std::ranges::copy(suffix_str, suffix.begin());
return suffix;
}
@@ -587,8 +586,8 @@
original_ordering[i] = int64_ordering[i] = position_ordering[i] = i;
}
- base::ranges::sort(int64_ordering, IndexedLessThan<int64_t>(kTestValues));
- base::ranges::sort(
+ std::ranges::sort(int64_ordering, IndexedLessThan<int64_t>(kTestValues));
+ std::ranges::sort(
position_ordering,
IndexedLessThan<UniquePosition, PositionLessThan>(positions));
EXPECT_NE(original_ordering, int64_ordering);
diff --git a/components/sync/engine/bookmark_update_preprocessing.cc b/components/sync/engine/bookmark_update_preprocessing.cc
index 5fc1cc6f..6e0c3fe 100644
--- a/components/sync/engine/bookmark_update_preprocessing.cc
+++ b/components/sync/engine/bookmark_update_preprocessing.cc
@@ -116,7 +116,7 @@
std::string suffix_str =
base::Base64Encode(base::SHA1Hash(base::as_byte_span(hash_input)));
CHECK_EQ(suffix.size(), suffix_str.size());
- base::ranges::copy(suffix_str, suffix.begin());
+ std::ranges::copy(suffix_str, suffix.begin());
return suffix;
}
diff --git a/components/sync/model/string_ordinal_unittest.cc b/components/sync/model/string_ordinal_unittest.cc
index b1e61a8..1e3b537e 100644
--- a/components/sync/model/string_ordinal_unittest.cc
+++ b/components/sync/model/string_ordinal_unittest.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/strings/ascii.h"
@@ -265,9 +264,9 @@
std::vector<StringOrdinal> ordinals = sorted_ordinals;
base::RandomShuffle(ordinals.begin(), ordinals.end());
- base::ranges::sort(ordinals, StringOrdinal::LessThanFn());
- EXPECT_TRUE(base::ranges::equal(ordinals, sorted_ordinals,
- StringOrdinal::EqualsFn()));
+ std::ranges::sort(ordinals, StringOrdinal::LessThanFn());
+ EXPECT_TRUE(
+ std::ranges::equal(ordinals, sorted_ordinals, StringOrdinal::EqualsFn()));
}
} // namespace
diff --git a/components/sync/test/fake_cryptographer.cc b/components/sync/test/fake_cryptographer.cc
index 961fb93..73f4a05a 100644
--- a/components/sync/test/fake_cryptographer.cc
+++ b/components/sync/test/fake_cryptographer.cc
@@ -4,9 +4,9 @@
#include "components/sync/test/fake_cryptographer.h"
+#include <algorithm>
#include <iterator>
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "components/sync/protocol/encryption.pb.h"
@@ -73,7 +73,7 @@
bool FakeCryptographer::DecryptToString(const sync_pb::EncryptedData& encrypted,
std::string* decrypted) const {
- auto key_iter = base::ranges::find(known_key_names_, encrypted.key_name());
+ auto key_iter = std::ranges::find(known_key_names_, encrypted.key_name());
if (key_iter == known_key_names_.end()) {
return false;
}
@@ -103,8 +103,8 @@
// here for simplicity.
std::vector<uint8_t> result;
result.reserve(plaintext.size() + recipient_public_key.size());
- base::ranges::copy(recipient_public_key, std::back_inserter(result));
- base::ranges::copy(plaintext, std::back_inserter(result));
+ std::ranges::copy(recipient_public_key, std::back_inserter(result));
+ std::ranges::copy(plaintext, std::back_inserter(result));
return result;
}
@@ -123,7 +123,7 @@
}
// Verify that the prefix contains an expected public key.
- if (base::ranges::equal(
+ if (std::ranges::equal(
cross_user_sharing_key_pair_.GetRawPublicKey().begin(),
cross_user_sharing_key_pair_.GetRawPublicKey().end(),
encrypted_data.begin(),
diff --git a/components/sync/test/nigori_test_utils.cc b/components/sync/test/nigori_test_utils.cc
index 8e62074..66824bb 100644
--- a/components/sync/test/nigori_test_utils.cc
+++ b/components/sync/test/nigori_test_utils.cc
@@ -4,9 +4,10 @@
#include "components/sync/test/nigori_test_utils.h"
+#include <algorithm>
+
#include "base/base64.h"
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "components/sync/base/time.h"
#include "components/sync/engine/nigori/cross_user_sharing_public_key.h"
#include "components/sync/engine/nigori/key_derivation_params.h"
@@ -245,7 +246,7 @@
EXPECT_TRUE(decrypted_keys.ParseFromString(decrypted_keys_str));
NigoriKeyBag key_bag = NigoriKeyBag::CreateEmpty();
- base::ranges::for_each(
+ std::ranges::for_each(
decrypted_keys.key(),
[&key_bag](sync_pb::NigoriKey key) { key_bag.AddKeyFromProto(key); });
diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc
index 26e1e92..9ae6e644 100644
--- a/components/sync_bookmarks/bookmark_model_merger.cc
+++ b/components/sync_bookmarks/bookmark_model_merger.cc
@@ -11,7 +11,6 @@
#include "base/containers/contains.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -524,7 +523,7 @@
}
// Sort the children according to their unique position.
- base::ranges::sort(node.children_, UniquePositionLessThan);
+ std::ranges::sort(node.children_, UniquePositionLessThan);
return node;
}
diff --git a/components/sync_bookmarks/bookmark_model_merger_unittest.cc b/components/sync_bookmarks/bookmark_model_merger_unittest.cc
index e0541f49..6ab9d96 100644
--- a/components/sync_bookmarks/bookmark_model_merger_unittest.cc
+++ b/components/sync_bookmarks/bookmark_model_merger_unittest.cc
@@ -4,12 +4,12 @@
#include "components/sync_bookmarks/bookmark_model_merger.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
@@ -260,7 +260,7 @@
}
last_pos = pos;
}
- return base::ranges::all_of(node->children(), [&tracker](const auto& child) {
+ return std::ranges::all_of(node->children(), [&tracker](const auto& child) {
return PositionsInTrackerMatchModel(child.get(), tracker);
});
}
diff --git a/components/sync_bookmarks/bookmark_remote_updates_handler.cc b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
index 31d58ce4..62c739a 100644
--- a/components/sync_bookmarks/bookmark_remote_updates_handler.cc
+++ b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
@@ -4,6 +4,7 @@
#include "components/sync_bookmarks/bookmark_remote_updates_handler.h"
+#include <algorithm>
#include <memory>
#include <set>
#include <string>
@@ -14,7 +15,6 @@
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/trace_event/trace_event.h"
#include "base/uuid.h"
#include "components/bookmarks/browser/bookmark_node.h"
@@ -123,7 +123,7 @@
const syncer::UniquePosition position =
syncer::UniquePosition::FromProto(unique_position);
- auto iter = base::ranges::partition_point(
+ auto iter = std::ranges::partition_point(
parent->children(),
[bookmark_tracker,
&position](const std::unique_ptr<bookmarks::BookmarkNode>& child) {
diff --git a/components/sync_bookmarks/local_bookmark_to_account_merger.cc b/components/sync_bookmarks/local_bookmark_to_account_merger.cc
index c3d65887..c0bfe8b 100644
--- a/components/sync_bookmarks/local_bookmark_to_account_merger.cc
+++ b/components/sync_bookmarks/local_bookmark_to_account_merger.cc
@@ -221,7 +221,7 @@
// `permanent_folder_child_ids_to_merge` is non-empty and excluded such node.
for (const auto& [local_permanent_node, unused] :
GetLocalAndAccountPermanentNodePairs(model_)) {
- CHECK(base::ranges::all_of(
+ CHECK(std::ranges::all_of(
local_permanent_node->children(),
[&permanent_folder_child_ids_to_merge](const auto& child) {
return permanent_folder_child_ids_to_merge.has_value() &&
diff --git a/components/sync_bookmarks/synced_bookmark_tracker.cc b/components/sync_bookmarks/synced_bookmark_tracker.cc
index 482e50a..6d0f33f 100644
--- a/components/sync_bookmarks/synced_bookmark_tracker.cc
+++ b/components/sync_bookmarks/synced_bookmark_tracker.cc
@@ -15,7 +15,6 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "base/uuid.h"
#include "components/bookmarks/browser/bookmark_node.h"
@@ -274,7 +273,7 @@
// Clear all references to the deleted bookmark node.
bookmark_node_to_entities_map_.erase(mutable_entity->bookmark_node());
mutable_entity->clear_bookmark_node();
- DCHECK_EQ(0, base::ranges::count(ordered_local_tombstones_, entity));
+ DCHECK_EQ(0, std::ranges::count(ordered_local_tombstones_, entity));
ordered_local_tombstones_.push_back(mutable_entity);
}
@@ -287,7 +286,7 @@
if (entity->bookmark_node()) {
DCHECK(!entity->metadata().is_deleted());
- DCHECK_EQ(0, base::ranges::count(ordered_local_tombstones_, entity));
+ DCHECK_EQ(0, std::ranges::count(ordered_local_tombstones_, entity));
bookmark_node_to_entities_map_.erase(entity->bookmark_node());
} else {
DCHECK(entity->metadata().is_deleted());
@@ -390,7 +389,7 @@
ReorderUnsyncedEntitiesExceptDeletions(entities_with_local_changes);
for (const SyncedBookmarkTrackerEntity* tombstone_entity :
ordered_local_tombstones_) {
- DCHECK_EQ(0, base::ranges::count(ordered_local_changes, tombstone_entity));
+ DCHECK_EQ(0, std::ranges::count(ordered_local_changes, tombstone_entity));
ordered_local_changes.push_back(tombstone_entity);
}
return ordered_local_changes;
diff --git a/components/sync_device_info/fake_device_info_tracker.cc b/components/sync_device_info/fake_device_info_tracker.cc
index 4dc79c70..d716123 100644
--- a/components/sync_device_info/fake_device_info_tracker.cc
+++ b/components/sync_device_info/fake_device_info_tracker.cc
@@ -4,13 +4,13 @@
#include "components/sync_device_info/fake_device_info_tracker.h"
+#include <algorithm>
#include <map>
#include "base/check.h"
#include "base/memory/raw_ptr.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/sync/protocol/sync_enums.pb.h"
#include "components/sync_device_info/device_info.h"
@@ -106,7 +106,7 @@
void FakeDeviceInfoTracker::Replace(const DeviceInfo* old_device,
const DeviceInfo* new_device) {
- auto it = base::ranges::find(devices_, old_device);
+ auto it = std::ranges::find(devices_, old_device);
CHECK(devices_.end() != it, base::NotFatalUntil::M130)
<< "Tracker doesn't contain device";
*it = new_device;
diff --git a/components/sync_sessions/open_tabs_ui_delegate_impl.cc b/components/sync_sessions/open_tabs_ui_delegate_impl.cc
index bb123245..16538a3 100644
--- a/components/sync_sessions/open_tabs_ui_delegate_impl.cc
+++ b/components/sync_sessions/open_tabs_ui_delegate_impl.cc
@@ -4,10 +4,10 @@
#include "components/sync_sessions/open_tabs_ui_delegate_impl.h"
+#include <algorithm>
#include <memory>
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "components/sync_sessions/sync_sessions_client.h"
#include "components/sync_sessions/synced_session_tracker.h"
@@ -27,7 +27,7 @@
std::vector<raw_ptr<const SyncedSession, VectorExperimental>>* sessions) {
*sessions = session_tracker_->LookupAllForeignSessions(
SyncedSessionTracker::PRESENTABLE);
- base::ranges::sort(
+ std::ranges::sort(
*sessions, std::greater(),
[](const SyncedSession* session) { return session->GetModifiedTime(); });
return !sessions->empty();
@@ -70,7 +70,7 @@
tabs->push_back(tab.get());
}
}
- base::ranges::stable_sort(
+ std::ranges::stable_sort(
*tabs, std::greater(),
[](const sessions::SessionTab* tab) { return tab->timestamp; });
return true;
diff --git a/components/sync_sessions/synced_session_tracker.cc b/components/sync_sessions/synced_session_tracker.cc
index 2898f94..316bedd 100644
--- a/components/sync_sessions/synced_session_tracker.cc
+++ b/components/sync_sessions/synced_session_tracker.cc
@@ -10,7 +10,6 @@
#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "components/sync/protocol/session_specifics.pb.h"
#include "components/sync/protocol/sync_enums.pb.h"
@@ -505,8 +504,8 @@
for (auto& [existing_window_id, existing_window] :
GetSession(session_tag)->windows) {
auto existing_tab_iter =
- base::ranges::find(existing_window->wrapped_window.tabs, tab_ptr,
- &std::unique_ptr<sessions::SessionTab>::get);
+ std::ranges::find(existing_window->wrapped_window.tabs, tab_ptr,
+ &std::unique_ptr<sessions::SessionTab>::get);
if (existing_tab_iter != existing_window->wrapped_window.tabs.end()) {
tab = std::move(*existing_tab_iter);
existing_window->wrapped_window.tabs.erase(existing_tab_iter);
@@ -672,8 +671,8 @@
session->synced_session.windows) {
auto& existing_window_tabs = existing_window->wrapped_window.tabs;
auto tab_iter =
- base::ranges::find(existing_window_tabs, new_tab_ptr,
- &std::unique_ptr<sessions::SessionTab>::get);
+ std::ranges::find(existing_window_tabs, new_tab_ptr,
+ &std::unique_ptr<sessions::SessionTab>::get);
if (tab_iter != existing_window_tabs.end()) {
existing_window_tabs.erase(tab_iter);
break;
diff --git a/components/tracing/common/active_processes_win.cc b/components/tracing/common/active_processes_win.cc
index 4dbf7477..dcd9754 100644
--- a/components/tracing/common/active_processes_win.cc
+++ b/components/tracing/common/active_processes_win.cc
@@ -4,10 +4,11 @@
#include "components/tracing/common/active_processes_win.h"
+#include <algorithm>
+
#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/version.h"
namespace tracing {
@@ -100,8 +101,8 @@
if (!inserted) {
// Duplicate pid. The event for the removal of this pid must have been lost.
// Forget about the old process's threads before replacing it.
- base::ranges::for_each(process.threads,
- [this](uint32_t tid) { threads_.erase(tid); });
+ std::ranges::for_each(process.threads,
+ [this](uint32_t tid) { threads_.erase(tid); });
process.threads.clear();
// Move the new process's properties into the instance.
process.parent_pid = parent_pid;
@@ -135,8 +136,8 @@
if (auto iter = processes_.find(pid); iter != processes_.end()) {
// Forget about this process's threads if they haven't already been removed.
- base::ranges::for_each(iter->second.threads,
- [this](uint32_t tid) { threads_.erase(tid); });
+ std::ranges::for_each(iter->second.threads,
+ [this](uint32_t tid) { threads_.erase(tid); });
processes_.erase(iter);
} // else the event for the addition of this process must have been lost.
}
@@ -245,7 +246,7 @@
IsSameOrParent(application_dir_, GetProgram(*client).DirName());
// Re-categorize all existing "other" processes to detect client processes.
- base::ranges::for_each(
+ std::ranges::for_each(
processes_,
[this](auto& process) {
if (process.category == Category::kOther) {
@@ -260,7 +261,7 @@
client_in_application_ = false;
// All previously-discovered client processes are now "other" processes.
- base::ranges::for_each(
+ std::ranges::for_each(
processes_,
[](auto& process) {
if (process.category == Category::kClient) {
diff --git a/components/tracing/common/etw_consumer_win_unittest.cc b/components/tracing/common/etw_consumer_win_unittest.cc
index d0831be..72bcee8 100644
--- a/components/tracing/common/etw_consumer_win_unittest.cc
+++ b/components/tracing/common/etw_consumer_win_unittest.cc
@@ -8,6 +8,7 @@
#include <stdint.h>
+#include <algorithm>
#include <optional>
#include <queue>
#include <utility>
@@ -19,7 +20,6 @@
#include "base/functional/callback.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/cstring_view.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/perfetto/include/perfetto/protozero/message.h"
@@ -109,11 +109,11 @@
if (version == 0) {
// ProcessId and ParentId are pointer-sized in version 0.
uintptr_t value = process.process_id;
- base::ranges::copy(base::byte_span_from_ref(value), iter);
+ std::ranges::copy(base::byte_span_from_ref(value), iter);
value = process.parent_id;
- base::ranges::copy(base::byte_span_from_ref(value), iter);
- base::ranges::copy(EncodeSid(), iter);
- base::ranges::copy(process.image_file_name, iter);
+ std::ranges::copy(base::byte_span_from_ref(value), iter);
+ std::ranges::copy(EncodeSid(), iter);
+ std::ranges::copy(process.image_file_name, iter);
buffer.insert(buffer.end(), '\0'); // ImageFileName terminator
} else {
if (version == 1) {
@@ -123,18 +123,18 @@
// UniqueProcessKey
buffer.insert(buffer.end(), sizeof(void*), 0);
}
- base::ranges::copy(base::byte_span_from_ref(process.process_id), iter);
- base::ranges::copy(base::byte_span_from_ref(process.parent_id), iter);
- base::ranges::copy(base::byte_span_from_ref(process.session_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(process.process_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(process.parent_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(process.session_id), iter);
buffer.insert(buffer.end(), sizeof(int32_t), 0); // ExitStatus
if (version >= 3) {
buffer.insert(buffer.end(), sizeof(void*), 0); // DirectoryTableBase
}
- base::ranges::copy(EncodeSid(), iter);
- base::ranges::copy(process.image_file_name, iter);
+ std::ranges::copy(EncodeSid(), iter);
+ std::ranges::copy(process.image_file_name, iter);
buffer.insert(buffer.end(), '\0'); // ImageFileName terminator
if (version >= 2) {
- base::ranges::copy(base::as_byte_span(process.command_line), iter);
+ std::ranges::copy(base::as_byte_span(process.command_line), iter);
buffer.insert(buffer.end(), sizeof(wchar_t), 0); // terminator
}
if (version >= 4) {
@@ -151,33 +151,33 @@
std::vector<uint8_t> buffer;
auto iter = std::back_inserter(buffer);
if (version == 0) {
- base::ranges::copy(base::byte_span_from_ref(thread.thread_id), iter);
- base::ranges::copy(base::byte_span_from_ref(thread.process_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(thread.thread_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(thread.process_id), iter);
} else {
- base::ranges::copy(base::byte_span_from_ref(thread.process_id), iter);
- base::ranges::copy(base::byte_span_from_ref(thread.thread_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(thread.process_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(thread.thread_id), iter);
uintptr_t a_pointer = 0;
uint32_t an_int = 0;
// StackBase
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
// StackLimit
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
// UserStackBase
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
// UserStackLimit
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
// StartAddr (1, 2) / Affinity (>=3)
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
// Win32StartAddr
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
if (version == 1) {
// WaitMode
buffer.insert(buffer.end(), 0x0a);
} else if (version >= 2) {
// TebBase
- base::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
+ std::ranges::copy(base::byte_span_from_ref(++a_pointer), iter);
// SubProcessTag
- base::ranges::copy(base::byte_span_from_ref(++an_int), iter);
+ std::ranges::copy(base::byte_span_from_ref(++an_int), iter);
}
if (version >= 3) {
buffer.insert(buffer.end(), 0x0a); // BasePriority
@@ -186,7 +186,7 @@
buffer.insert(buffer.end(), 0x0d); // ThreadFlags
}
if (version >= 4 && thread.thread_name.has_value()) {
- base::ranges::copy(base::as_byte_span(*thread.thread_name), iter);
+ std::ranges::copy(base::as_byte_span(*thread.thread_name), iter);
buffer.insert(buffer.end(), sizeof(wchar_t), 0); // ThreadName terminator
}
}
@@ -198,9 +198,9 @@
base::wcstring_view thread_name) {
std::vector<uint8_t> buffer;
auto iter = std::back_inserter(buffer);
- base::ranges::copy(base::byte_span_from_ref(process_id), iter);
- base::ranges::copy(base::byte_span_from_ref(thread_id), iter);
- base::ranges::copy(base::as_byte_span(thread_name), iter);
+ std::ranges::copy(base::byte_span_from_ref(process_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(thread_id), iter);
+ std::ranges::copy(base::as_byte_span(thread_name), iter);
buffer.insert(buffer.end(), sizeof(wchar_t), 0); // ThreadName terminator
return base::HeapArray<uint8_t>::CopiedFrom({buffer});
}
@@ -209,8 +209,8 @@
base::HeapArray<uint8_t> EncodeCSwitch(const CSwitchData& c_switch) {
std::vector<uint8_t> buffer;
auto iter = std::back_inserter(buffer);
- base::ranges::copy(base::byte_span_from_ref(c_switch.new_thread_id), iter);
- base::ranges::copy(base::byte_span_from_ref(c_switch.old_thread_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(c_switch.new_thread_id), iter);
+ std::ranges::copy(base::byte_span_from_ref(c_switch.old_thread_id), iter);
buffer.insert(buffer.end(), 0x01); // NewThreadPriority
buffer.insert(buffer.end(), 0x02); // OldThreadPriority
buffer.insert(buffer.end(), 0x03); // PreviousCState
@@ -220,7 +220,7 @@
buffer.insert(buffer.end(), 7); // OldThreadState = DEFERRED_READY
buffer.insert(buffer.end(), 0x04); // OldThreadWaitIdealProcessor
const uint32_t new_thread_wait_time = 0x05;
- base::ranges::copy(base::byte_span_from_ref(new_thread_wait_time), iter);
+ std::ranges::copy(base::byte_span_from_ref(new_thread_wait_time), iter);
buffer.insert(buffer.end(), sizeof(uint32_t), 0x42); // Reserved
return base::HeapArray<uint8_t>::CopiedFrom({buffer});
}
diff --git a/components/tracing/common/system_log_event_utils_win_unittest.cc b/components/tracing/common/system_log_event_utils_win_unittest.cc
index aba3936..3371a82 100644
--- a/components/tracing/common/system_log_event_utils_win_unittest.cc
+++ b/components/tracing/common/system_log_event_utils_win_unittest.cc
@@ -6,12 +6,12 @@
#include <windows.h>
+#include <algorithm>
#include <optional>
#include "base/containers/buffer_iterator.h"
#include "base/containers/heap_array.h"
#include "base/containers/span.h"
-#include "base/ranges/algorithm.h"
#include "base/win/sid.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/translate/content/android/translate_message_unittest.cc b/components/translate/content/android/translate_message_unittest.cc
index c2a5d0f..f7f47895 100644
--- a/components/translate/content/android/translate_message_unittest.cc
+++ b/components/translate/content/android/translate_message_unittest.cc
@@ -4,10 +4,11 @@
#include "components/translate/content/android/translate_message.h"
+#include <algorithm>
+
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
@@ -288,9 +289,9 @@
std::vector<bool> actual_vector;
base::android::JavaBooleanArrayToBoolVector(env, actual,
&actual_vector);
- return base::ranges::equal(expected_items, actual_vector,
- std::equal_to<>(),
- &SecondaryMenuItem::has_checkmark);
+ return std::ranges::equal(expected_items, actual_vector,
+ std::equal_to<>(),
+ &SecondaryMenuItem::has_checkmark);
}),
/*overflow_menu_item_ids=*/
Truly([env, expected_items](
@@ -299,11 +300,11 @@
std::vector<int> actual_vector;
base::android::JavaIntArrayToIntVector(env, actual,
&actual_vector);
- return base::ranges::equal(expected_items, actual_vector,
- std::equal_to<>(),
- [](const SecondaryMenuItem& item) {
- return static_cast<int>(item.id);
- });
+ return std::ranges::equal(expected_items, actual_vector,
+ std::equal_to<>(),
+ [](const SecondaryMenuItem& item) {
+ return static_cast<int>(item.id);
+ });
}),
/*language_codes=*/
Truly([env, expected_items](
@@ -312,9 +313,9 @@
std::vector<std::string> actual_vector;
base::android::AppendJavaStringArrayToStringVector(
env, actual, &actual_vector);
- return base::ranges::equal(expected_items, actual_vector,
- std::equal_to<>(),
- &SecondaryMenuItem::language_code);
+ return std::ranges::equal(expected_items, actual_vector,
+ std::equal_to<>(),
+ &SecondaryMenuItem::language_code);
})))
.WillOnce(Return(return_value));
}
diff --git a/components/translate/core/browser/translate_language_list.cc b/components/translate/core/browser/translate_language_list.cc
index 64d8f365..79e45436 100644
--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <iterator>
#include <optional>
#include <string_view>
@@ -15,7 +16,6 @@
#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
@@ -331,7 +331,7 @@
DCHECK(
std::is_sorted(supported_languages_.begin(), supported_languages_.end()));
DCHECK(supported_languages_.end() ==
- base::ranges::adjacent_find(supported_languages_));
+ std::ranges::adjacent_find(supported_languages_));
if (update_is_disabled)
return;
@@ -375,14 +375,14 @@
}
bool TranslateLanguageList::IsSupportedLanguage(std::string_view language) {
- return base::ranges::binary_search(supported_languages_, language);
+ return std::ranges::binary_search(supported_languages_, language);
}
// static
bool TranslateLanguageList::IsSupportedPartialTranslateLanguage(
std::string_view language) {
- return base::ranges::binary_search(kDefaultSupportedPartialTranslateLanguages,
- language);
+ return std::ranges::binary_search(kDefaultSupportedPartialTranslateLanguages,
+ language);
}
// static
@@ -522,7 +522,7 @@
DCHECK(
std::is_sorted(supported_languages_.begin(), supported_languages_.end()));
DCHECK(supported_languages_.end() ==
- base::ranges::adjacent_find(supported_languages_));
+ std::ranges::adjacent_find(supported_languages_));
NotifyEvent(__LINE__, base::JoinString(supported_languages_, ", "));
return true;
diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc
index 43dd4857..30c9f71 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc
@@ -4,6 +4,7 @@
#include "components/translate/core/browser/translate_prefs.h"
+#include <algorithm>
#include <limits>
#include <map>
#include <memory>
@@ -16,7 +17,6 @@
#include "base/feature_list.h"
#include "base/i18n/rtl.h"
#include "base/json/values_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -80,7 +80,7 @@
// about always translating from or to the old source language, or always
// translating from the old target language, then skip merging this pair
// into the new pref.
- if (base::ranges::any_of(
+ if (std::ranges::any_of(
always_translate_dictionary,
[&old_language_pair](const auto& new_language_pair) {
return old_language_pair.first == new_language_pair.first ||
@@ -351,7 +351,7 @@
GetUserSelectedLanguageList(&user_selected_languages);
// Remove the language from the list.
- const auto& it = base::ranges::find(user_selected_languages, chrome_language);
+ const auto& it = std::ranges::find(user_selected_languages, chrome_language);
if (it != user_selected_languages.end()) {
user_selected_languages.erase(it);
@@ -385,7 +385,7 @@
std::vector<std::string> languages;
GetUserSelectedLanguageList(&languages);
- auto pos = base::ranges::find(languages, language);
+ auto pos = std::ranges::find(languages, language);
if (pos == languages.end())
return;
@@ -973,7 +973,7 @@
ScopedListPrefUpdate update(prefs_, pref_id);
base::Value::List& never_prompt_list = update.Get();
- auto value_to_erase = base::ranges::find_if(
+ auto value_to_erase = std::ranges::find_if(
never_prompt_list, [value](const base::Value& value_in_list) {
return value_in_list.is_string() && value_in_list.GetString() == value;
});
diff --git a/components/trusted_vault/download_keys_response_handler.cc b/components/trusted_vault/download_keys_response_handler.cc
index 5449faf..cd21401a 100644
--- a/components/trusted_vault/download_keys_response_handler.cc
+++ b/components/trusted_vault/download_keys_response_handler.cc
@@ -4,11 +4,11 @@
#include "components/trusted_vault/download_keys_response_handler.h"
+#include <algorithm>
#include <map>
#include <optional>
#include <utility>
-#include "base/ranges/algorithm.h"
#include "components/trusted_vault/proto/vault.pb.h"
#include "components/trusted_vault/proto_string_bytes_conversion.h"
#include "components/trusted_vault/securebox.h"
diff --git a/components/trusted_vault/securebox.cc b/components/trusted_vault/securebox.cc
index 2df777e..384c7c5 100644
--- a/components/trusted_vault/securebox.cc
+++ b/components/trusted_vault/securebox.cc
@@ -16,7 +16,6 @@
#include "base/check_op.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
-#include "base/ranges/algorithm.h"
#include "crypto/hkdf.h"
#include "crypto/openssl_util.h"
#include "crypto/random.h"
diff --git a/components/trusted_vault/standalone_trusted_vault_backend.cc b/components/trusted_vault/standalone_trusted_vault_backend.cc
index c407401..2dd74536 100644
--- a/components/trusted_vault/standalone_trusted_vault_backend.cc
+++ b/components/trusted_vault/standalone_trusted_vault_backend.cc
@@ -20,7 +20,6 @@
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/sequence_checker.h"
#include "base/stl_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/components/ui_devtools/dom_agent.cc b/components/ui_devtools/dom_agent.cc
index a6e4781..96b86e2 100644
--- a/components/ui_devtools/dom_agent.cc
+++ b/components/ui_devtools/dom_agent.cc
@@ -4,6 +4,7 @@
#include "components/ui_devtools/dom_agent.h"
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/containers/adapters.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "components/ui_devtools/devtools_server.h"
@@ -153,7 +153,7 @@
child->set_is_updating(true);
const auto& children = parent->children();
- auto iter = base::ranges::find(children, child);
+ auto iter = std::ranges::find(children, child);
int prev_node_id =
(iter == children.begin()) ? 0 : (*std::prev(iter))->node_id();
frontend()->childNodeInserted(parent->node_id(), prev_node_id,
@@ -168,7 +168,7 @@
DCHECK(node_id_to_ui_element_.count(parent->node_id()));
const auto& children = parent->children();
- auto iter = base::ranges::find(children, child);
+ auto iter = std::ranges::find(children, child);
CHECK(iter != children.end());
int prev_node_id =
(iter == children.begin()) ? 0 : (*std::prev(iter))->node_id();
diff --git a/components/ui_devtools/ui_devtools_unittest_utils.cc b/components/ui_devtools/ui_devtools_unittest_utils.cc
index 9d80fb8..d5bb197 100644
--- a/components/ui_devtools/ui_devtools_unittest_utils.cc
+++ b/components/ui_devtools/ui_devtools_unittest_utils.cc
@@ -4,7 +4,8 @@
#include "components/ui_devtools/ui_devtools_unittest_utils.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/string_util.h"
#include "third_party/inspector_protocol/crdtp/json.h"
@@ -27,7 +28,7 @@
}
int FakeFrontendChannel::CountProtocolNotificationMessage(
const std::string& message) {
- return base::ranges::count(protocol_notification_messages_, message);
+ return std::ranges::count(protocol_notification_messages_, message);
}
void FakeFrontendChannel::SendProtocolNotification(
diff --git a/components/ui_devtools/ui_element.cc b/components/ui_devtools/ui_element.cc
index 7d82a23b..97847bfbb 100644
--- a/components/ui_devtools/ui_element.cc
+++ b/components/ui_devtools/ui_element.cc
@@ -4,10 +4,11 @@
#include "components/ui_devtools/ui_element.h"
+#include <algorithm>
+
#include "base/check_op.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/ui_devtools/protocol.h"
#include "components/ui_devtools/ui_element_delegate.h"
@@ -60,7 +61,7 @@
void UIElement::AddChild(UIElement* child, UIElement* before) {
if (before) {
- auto iter = base::ranges::find(children_, before);
+ auto iter = std::ranges::find(children_, before);
CHECK(iter != children_.end(), base::NotFatalUntil::M130);
children_.insert(iter, child);
} else {
@@ -90,13 +91,13 @@
void UIElement::RemoveChild(UIElement* child, bool notify_delegate) {
if (notify_delegate)
delegate_->OnUIElementRemoved(child);
- auto iter = base::ranges::find(children_, child);
+ auto iter = std::ranges::find(children_, child);
CHECK(iter != children_.end(), base::NotFatalUntil::M130);
children_.erase(iter);
}
void UIElement::ReorderChild(UIElement* child, int index) {
- auto i = base::ranges::find(children_, child);
+ auto i = std::ranges::find(children_, child);
CHECK(i != children_.end(), base::NotFatalUntil::M130);
DCHECK_GE(index, 0);
DCHECK_LT(static_cast<size_t>(index), children_.size());
diff --git a/components/ui_devtools/views/dom_agent_aura.cc b/components/ui_devtools/views/dom_agent_aura.cc
index b1fa29e..383cf51 100644
--- a/components/ui_devtools/views/dom_agent_aura.cc
+++ b/components/ui_devtools/views/dom_agent_aura.cc
@@ -4,9 +4,9 @@
#include "components/ui_devtools/views/dom_agent_aura.h"
+#include <algorithm>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "components/ui_devtools/views/widget_element.h"
#include "components/ui_devtools/views/window_element.h"
#include "ui/aura/env.h"
@@ -56,7 +56,7 @@
if (element_root() && !element_root()->is_updating()) {
const auto& children = element_root()->children();
- auto iter = base::ranges::find(children, window, &WindowElement::From);
+ auto iter = std::ranges::find(children, window, &WindowElement::From);
if (iter != children.end()) {
UIElement* child_element = *iter;
element_root()->RemoveChild(child_element);
diff --git a/components/ui_devtools/views/dom_agent_mac.mm b/components/ui_devtools/views/dom_agent_mac.mm
index 5cea3c4..f3dbcb07 100644
--- a/components/ui_devtools/views/dom_agent_mac.mm
+++ b/components/ui_devtools/views/dom_agent_mac.mm
@@ -6,8 +6,9 @@
#import <AppKit/AppKit.h>
+#include <algorithm>
+
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "components/ui_devtools/views/widget_element.h"
#include "ui/views/widget/native_widget_mac.h"
@@ -49,7 +50,7 @@
void DOMAgentMac::OnWidgetDestroying(views::Widget* widget) {
widget->RemoveObserver(this);
- roots_.erase(base::ranges::find(roots_, widget), roots_.end());
+ roots_.erase(std::ranges::find(roots_, widget), roots_.end());
}
void DOMAgentMac::OnNativeWidgetAdded(views::NativeWidgetMac* native_widget) {
diff --git a/components/ui_devtools/views/view_element.cc b/components/ui_devtools/views/view_element.cc
index 24596fd..78e7a152a 100644
--- a/components/ui_devtools/views/view_element.cc
+++ b/components/ui_devtools/views/view_element.cc
@@ -4,8 +4,9 @@
#include "components/ui_devtools/views/view_element.h"
+#include <algorithm>
+
#include "base/containers/contains.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -91,7 +92,7 @@
void ViewElement::OnChildViewRemoved(views::View* parent, views::View* view) {
DCHECK_EQ(parent, view_);
- auto iter = base::ranges::find(children(), view, [](UIElement* child) {
+ auto iter = std::ranges::find(children(), view, [](UIElement* child) {
return UIElement::GetBackingElement<views::View, ViewElement>(child);
});
if (iter == children().end()) {
@@ -116,7 +117,7 @@
void ViewElement::OnChildViewReordered(views::View* parent, views::View* view) {
DCHECK_EQ(parent, view_);
- auto iter = base::ranges::find(children(), view, [](UIElement* child) {
+ auto iter = std::ranges::find(children(), view, [](UIElement* child) {
return UIElement::GetBackingElement<views::View, ViewElement>(child);
});
if (iter == children().end() ||
diff --git a/components/ui_devtools/views/window_element.cc b/components/ui_devtools/views/window_element.cc
index a424adc..65ec9ae 100644
--- a/components/ui_devtools/views/window_element.cc
+++ b/components/ui_devtools/views/window_element.cc
@@ -4,8 +4,9 @@
#include "components/ui_devtools/views/window_element.h"
+#include <algorithm>
+
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "components/ui_devtools/protocol.h"
#include "components/ui_devtools/ui_element_delegate.h"
@@ -24,7 +25,7 @@
int GetIndexOfChildInParent(aura::Window* window) {
const aura::Window::Windows& siblings = window->parent()->children();
- auto it = base::ranges::find(siblings, window);
+ auto it = std::ranges::find(siblings, window);
CHECK(it != siblings.end(), base::NotFatalUntil::M130);
return std::distance(siblings.begin(), it);
}
diff --git a/components/ukm/test_ukm_recorder.cc b/components/ukm/test_ukm_recorder.cc
index edc09c3..e117ec6c 100644
--- a/components/ukm/test_ukm_recorder.cc
+++ b/components/ukm/test_ukm_recorder.cc
@@ -4,13 +4,13 @@
#include "components/ukm/test_ukm_recorder.h"
+#include <algorithm>
#include <iterator>
#include <string_view>
#include "base/check_op.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/metrics_hashes.h"
-#include "base/ranges/algorithm.h"
#include "services/metrics/public/cpp/delegating_ukm_recorder.h"
#include "services/metrics/public/cpp/ukm_builders.h"
#include "services/metrics/public/cpp/ukm_source.h"
@@ -201,7 +201,7 @@
std::vector<std::string> metric_name_vector(1, metric_name);
std::vector<ukm::TestAutoSetUkmRecorder::HumanReadableUkmMetrics>
filtered_result;
- base::ranges::copy_if(
+ std::ranges::copy_if(
GetMetrics(entry_name, metric_name_vector),
std::back_inserter(filtered_result),
[&metric_name](
diff --git a/components/ukm/ukm_service_unittest.cc b/components/ukm/ukm_service_unittest.cc
index 4757711..efe2691 100644
--- a/components/ukm/ukm_service_unittest.cc
+++ b/components/ukm/ukm_service_unittest.cc
@@ -4,6 +4,7 @@
#include "components/ukm/ukm_service.h"
+#include <algorithm>
#include <map>
#include <memory>
#include <set>
@@ -20,7 +21,6 @@
#include "base/hash/hash.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/metrics_hashes.h"
-#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/components/undo/bookmark_undo_service.cc b/components/undo/bookmark_undo_service.cc
index 972c1a9e..51c9da6 100644
--- a/components/undo/bookmark_undo_service.cc
+++ b/components/undo/bookmark_undo_service.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <cstdint>
#include <memory>
#include <utility>
@@ -14,7 +15,6 @@
#include "base/check.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "components/bookmarks/browser/bookmark_node.h"
#include "components/bookmarks/browser/bookmark_node_data.h"
#include "components/bookmarks/browser/bookmark_undo_provider.h"
@@ -306,8 +306,8 @@
: BookmarkUndoOperation(bookmark_model),
parent_id_(parent->id()) {
ordered_bookmarks_.resize(parent->children().size());
- base::ranges::transform(parent->children(), ordered_bookmarks_.begin(),
- &BookmarkNode::id);
+ std::ranges::transform(parent->children(), ordered_bookmarks_.begin(),
+ &BookmarkNode::id);
}
BookmarkReorderOperation::~BookmarkReorderOperation() = default;
diff --git a/components/unexportable_keys/unexportable_key_service_impl.cc b/components/unexportable_keys/unexportable_key_service_impl.cc
index 3c30f83c..d556cd52 100644
--- a/components/unexportable_keys/unexportable_key_service_impl.cc
+++ b/components/unexportable_keys/unexportable_key_service_impl.cc
@@ -4,11 +4,12 @@
#include "components/unexportable_keys/unexportable_key_service_impl.h"
+#include <algorithm>
+
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "components/unexportable_keys/service_error.h"
#include "components/unexportable_keys/unexportable_key_id.h"
@@ -240,7 +241,7 @@
// `key` must be non-null if `key_or_error` holds a value.
CHECK(key);
DCHECK(
- base::ranges::equal(pending_entry_it->first, key->key().GetWrappedKey()));
+ std::ranges::equal(pending_entry_it->first, key->key().GetWrappedKey()));
UnexportableKeyId key_id = key->id();
// A newly created key ID must be unique.
diff --git a/components/unified_consent/url_keyed_data_collection_consent_helper.cc b/components/unified_consent/url_keyed_data_collection_consent_helper.cc
index a7fc289..0c9b4aaf 100644
--- a/components/unified_consent/url_keyed_data_collection_consent_helper.cc
+++ b/components/unified_consent/url_keyed_data_collection_consent_helper.cc
@@ -4,13 +4,13 @@
#include "components/unified_consent/url_keyed_data_collection_consent_helper.h"
+#include <algorithm>
#include <map>
#include <set>
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
#include "components/sync/base/data_type.h"
@@ -149,7 +149,7 @@
}
}
- DCHECK(base::ranges::all_of(sync_data_type_states_, [](auto& state) {
+ DCHECK(std::ranges::all_of(sync_data_type_states_, [](auto& state) {
return state.second == syncer::UploadState::ACTIVE;
})) << "Nothing is NOT_ACTIVE or INITIALIZING, so all must be ACTIVE.";
return State::kEnabled;
diff --git a/components/update_client/background_downloader_win.cc b/components/update_client/background_downloader_win.cc
index b37fd82..378d2d3 100644
--- a/components/update_client/background_downloader_win.cc
+++ b/components/update_client/background_downloader_win.cc
@@ -13,6 +13,7 @@
#include <stdint.h>
#include <winerror.h>
+#include <algorithm>
#include <limits>
#include <memory>
#include <utility>
@@ -29,7 +30,6 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
@@ -926,7 +926,7 @@
if (base::GetTempDir(&dir)) {
dirs.push_back(dir);
}
- base::ranges::for_each(dirs, [&](const base::FilePath& parent_dir) {
+ std::ranges::for_each(dirs, [&](const base::FilePath& parent_dir) {
base::FileEnumerator(parent_dir,
/*recursive=*/false, base::FileEnumerator::DIRECTORIES,
matcher)
diff --git a/components/update_client/component.cc b/components/update_client/component.cc
index 92b22dd5..1b8db60 100644
--- a/components/update_client/component.cc
+++ b/components/update_client/component.cc
@@ -4,6 +4,7 @@
#include "components/update_client/component.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include <string>
@@ -22,7 +23,6 @@
#include "base/memory/raw_ref.h"
#include "base/memory/scoped_refptr.h"
#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/bind_post_task.h"
diff --git a/components/update_client/pipeline.cc b/components/update_client/pipeline.cc
index a6e9989..764b8a4 100644
--- a/components/update_client/pipeline.cc
+++ b/components/update_client/pipeline.cc
@@ -421,7 +421,7 @@
if (install_data_index.empty() || result.data.empty()) {
return "";
}
- const auto it = base::ranges::find(
+ const auto it = std::ranges::find(
result.data, install_data_index,
&ProtocolParser::Result::Data::install_data_index);
return it != std::end(result.data) ? it->text : "";
diff --git a/components/update_client/protocol_parser_json.cc b/components/update_client/protocol_parser_json.cc
index ce2eeb2..ee0f548f 100644
--- a/components/update_client/protocol_parser_json.cc
+++ b/components/update_client/protocol_parser_json.cc
@@ -4,13 +4,13 @@
#include "components/update_client/protocol_parser_json.h"
+#include <algorithm>
#include <optional>
#include <string>
#include <utility>
#include "base/check.h"
#include "base/json/json_reader.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/values.h"
@@ -291,7 +291,7 @@
CHECK(result->status.empty() || result->status == "ok");
if (const base::Value::List* data_node = app_node.FindList("data")) {
- base::ranges::for_each(*data_node, [&result](const base::Value& data) {
+ std::ranges::for_each(*data_node, [&result](const base::Value& data) {
ParseData(data, result);
});
}
diff --git a/components/update_client/update_checker.cc b/components/update_client/update_checker.cc
index 56c3f5ba..7f5455a9 100644
--- a/components/update_client/update_checker.cc
+++ b/components/update_client/update_checker.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <functional>
#include <memory>
#include <optional>
@@ -21,7 +22,6 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/sequence_checker.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
@@ -165,7 +165,7 @@
CHECK(!context->components.empty());
const bool is_foreground =
context->components.cbegin()->second->is_foreground();
- CHECK(base::ranges::all_of(
+ CHECK(std::ranges::all_of(
context->components,
[is_foreground](IdToComponentPtrMap::const_reference& elem) {
return is_foreground == elem.second->is_foreground();
diff --git a/components/update_client/utils.cc b/components/update_client/utils.cc
index 6e475375..d825be73 100644
--- a/components/update_client/utils.cc
+++ b/components/update_client/utils.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <cmath>
#include <cstring>
#include <memory>
@@ -20,7 +21,6 @@
#include "base/functional/callback.h"
#include "base/json/json_file_value_serializer.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/system/sys_info.h"
@@ -113,7 +113,7 @@
const size_t kMaxBrandSize = 4;
return brand.empty() ||
(brand.size() == kMaxBrandSize &&
- base::ranges::all_of(brand, &base::IsAsciiAlpha<char>));
+ std::ranges::all_of(brand, &base::IsAsciiAlpha<char>));
}
// Helper function.
@@ -124,7 +124,7 @@
size_t min_length,
size_t max_length) {
return part.size() >= min_length && part.size() <= max_length &&
- base::ranges::all_of(part, [&special_chars](char ch) {
+ std::ranges::all_of(part, [&special_chars](char ch) {
return base::IsAsciiAlpha(ch) || base::IsAsciiDigit(ch) ||
base::Contains(special_chars, ch);
});
diff --git a/components/url_formatter/spoof_checks/top_domains/make_top_domain_list_variables.cc b/components/url_formatter/spoof_checks/top_domains/make_top_domain_list_variables.cc
index a5316e8..5547841 100644
--- a/components/url_formatter/spoof_checks/top_domains/make_top_domain_list_variables.cc
+++ b/components/url_formatter/spoof_checks/top_domains/make_top_domain_list_variables.cc
@@ -24,6 +24,7 @@
// IMPORTANT: This binary asserts that there are at least enough sites in the
// input file to generate 500 skeletons and 500 keywords.
+#include <algorithm>
#include <iostream>
#include <set>
#include <sstream>
@@ -35,7 +36,6 @@
#include "base/i18n/icu_util.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -79,7 +79,7 @@
}
bool ContainsOnlyDigits(const std::string& text) {
- return base::ranges::all_of(text.begin(), text.end(), ::isdigit);
+ return std::ranges::all_of(text.begin(), text.end(), ::isdigit);
}
} // namespace
diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
index 5b542af..4b3e87d 100644
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -11,13 +11,13 @@
#include <stddef.h>
+#include <algorithm>
#include <string_view>
#include "base/check_op.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/i18n/char_iterator.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/escape.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -115,7 +115,7 @@
void PrepareStringForFileOps(const base::FilePath& text, std::string* output) {
TrimWhitespace(text.AsUTF16Unsafe(), base::TRIM_ALL, output);
#if BUILDFLAG(IS_WIN)
- base::ranges::replace(*output, '/', '\\');
+ std::ranges::replace(*output, '/', '\\');
#endif
}
@@ -382,7 +382,7 @@
//
// https://url.spec.whatwg.org/#url-port-string says that "A URL-port string
// must be zero or more ASCII digits".
- if (!base::ranges::all_of(port_piece, base::IsAsciiDigit<char>)) {
+ if (!std::ranges::all_of(port_piece, base::IsAsciiDigit<char>)) {
return false;
}
diff --git a/components/url_matcher/url_matcher.cc b/components/url_matcher/url_matcher.cc
index 95b7b8dc..444eb0ed 100644
--- a/components/url_matcher/url_matcher.cc
+++ b/components/url_matcher/url_matcher.cc
@@ -739,8 +739,8 @@
return false;
}
- return base::ranges::any_of(cidr_blocks_, [&ip_address](
- const CidrBlock& block) {
+ return std::ranges::any_of(cidr_blocks_, [&ip_address](
+ const CidrBlock& block) {
return net::IPAddressMatchesPrefix(ip_address, block.first, block.second);
});
}
diff --git a/components/url_matcher/url_matcher_factory.cc b/components/url_matcher/url_matcher_factory.cc
index 13b0bd0..5a385add 100644
--- a/components/url_matcher/url_matcher_factory.cc
+++ b/components/url_matcher/url_matcher_factory.cc
@@ -4,12 +4,12 @@
#include "components/url_matcher/url_matcher_factory.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include "base/check.h"
#include "base/lazy_instance.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "components/url_matcher/url_matcher_constants.h"
@@ -186,7 +186,7 @@
// Returns true if some alphabetic characters in this string are upper case.
bool ContainsUpperCase(const std::string& str) {
- return base::ranges::any_of(str, ::isupper);
+ return std::ranges::any_of(str, ::isupper);
}
} // namespace
diff --git a/components/url_pattern/url_pattern_util.cc b/components/url_pattern/url_pattern_util.cc
index 52d2323..4eb328b 100644
--- a/components/url_pattern/url_pattern_util.cc
+++ b/components/url_pattern/url_pattern_util.cc
@@ -9,10 +9,10 @@
#include "components/url_pattern/url_pattern_util.h"
+#include <ranges>
#include <string_view>
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/ranges.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "url/url_util.h"
@@ -32,7 +32,7 @@
//
// We only check the code points the chromium URL parser incorrectly permits.
// See: crbug.com/1065667#c18
- return base::ranges::any_of(input, [](char c) {
+ return std::ranges::any_of(input, [](char c) {
return c == ' ' || c == '#' || c == ':' || c == '<' || c == '>' ||
c == '@' || c == '[' || c == ']' || c == '|';
});
diff --git a/components/url_pattern_index/url_pattern.cc b/components/url_pattern_index/url_pattern.cc
index 79c6802..d7d021e 100644
--- a/components/url_pattern_index/url_pattern.cc
+++ b/components/url_pattern_index/url_pattern.cc
@@ -17,13 +17,13 @@
#include <stddef.h>
+#include <algorithm>
#include <ostream>
#include <string_view>
#include "base/check_op.h"
#include "base/notreached.h"
#include "base/numerics/checked_math.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "components/url_pattern_index/flat/url_pattern_index_generated.h"
#include "components/url_pattern_index/fuzzy_pattern_matching.h"
@@ -74,7 +74,7 @@
}
bool HasAnyUpperAscii(std::string_view string) {
- return base::ranges::any_of(string, base::IsAsciiUpper<char>);
+ return std::ranges::any_of(string, base::IsAsciiUpper<char>);
}
// Returns whether |position| within the |url| belongs to its |host| component
diff --git a/components/url_pattern_index/url_pattern_index.cc b/components/url_pattern_index/url_pattern_index.cc
index f1b6e25..7422c43c 100644
--- a/components/url_pattern_index/url_pattern_index.cc
+++ b/components/url_pattern_index/url_pattern_index.cc
@@ -4,6 +4,7 @@
#include "components/url_pattern_index/url_pattern_index.h"
+#include <algorithm>
#include <limits>
#include <string>
#include <string_view>
@@ -18,7 +19,6 @@
#include "base/not_fatal_until.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
#include "components/url_pattern_index/ngram_extractor.h"
@@ -100,7 +100,7 @@
}
bool HasNoUpperAscii(std::string_view string) {
- return base::ranges::none_of(string, base::IsAsciiUpper<char>);
+ return std::ranges::none_of(string, base::IsAsciiUpper<char>);
}
// Comparator to sort UrlRule. Sorts rules by descending order of rule priority.
diff --git a/components/url_pattern_index/url_pattern_index_unittest.cc b/components/url_pattern_index/url_pattern_index_unittest.cc
index 7d9bdef8..ad15b2e 100644
--- a/components/url_pattern_index/url_pattern_index_unittest.cc
+++ b/components/url_pattern_index/url_pattern_index_unittest.cc
@@ -22,7 +22,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "components/url_pattern_index/url_pattern.h"
#include "components/url_pattern_index/url_rule_test_support.h"
@@ -1146,8 +1145,8 @@
});
EmbedderConditionsMatcher match_has_evens =
base::BindRepeating([](const flatbuffers::Vector<uint8_t>& conditions) {
- return base::ranges::any_of(conditions,
- [](int i) { return i % 2 == 0; });
+ return std::ranges::any_of(conditions,
+ [](int i) { return i % 2 == 0; });
});
struct Cases {
diff --git a/components/url_rewrite/browser/url_request_rewrite_rules_validation.cc b/components/url_rewrite/browser/url_request_rewrite_rules_validation.cc
index 6c05af0..99754ee 100644
--- a/components/url_rewrite/browser/url_request_rewrite_rules_validation.cc
+++ b/components/url_rewrite/browser/url_request_rewrite_rules_validation.cc
@@ -4,9 +4,9 @@
#include "components/url_rewrite/browser/url_request_rewrite_rules_validation.h"
+#include <algorithm>
#include <string_view>
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "net/http/http_util.h"
#include "url/url_constants.h"
@@ -24,7 +24,7 @@
LOG(ERROR) << "Add headers is missing";
return false;
}
- return base::ranges::all_of(
+ return std::ranges::all_of(
add_headers->headers, [](const mojom::UrlHeaderPtr& header) {
if (!net::HttpUtil::IsValidHeaderName(header->name)) {
LOG(ERROR) << "Invalid header name: " << header->name;
diff --git a/components/user_education/common/tutorial/tutorial.cc b/components/user_education/common/tutorial/tutorial.cc
index 7ed8eb23..4b12177b 100644
--- a/components/user_education/common/tutorial/tutorial.cc
+++ b/components/user_education/common/tutorial/tutorial.cc
@@ -4,12 +4,12 @@
#include "components/user_education/common/tutorial/tutorial.h"
+#include <algorithm>
#include <optional>
#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/strings/grit/components_strings.h"
#include "components/user_education/common/help_bubble/help_bubble.h"
diff --git a/components/user_education/common/tutorial/tutorial_registry.cc b/components/user_education/common/tutorial/tutorial_registry.cc
index b68efac..0c55790 100644
--- a/components/user_education/common/tutorial/tutorial_registry.cc
+++ b/components/user_education/common/tutorial/tutorial_registry.cc
@@ -4,13 +4,13 @@
#include "components/user_education/common/tutorial/tutorial_registry.h"
+#include <algorithm>
#include <memory>
#include <vector>
#include "base/check.h"
#include "base/containers/contains.h"
#include "base/dcheck_is_on.h"
-#include "base/ranges/algorithm.h"
#include "components/user_education/common/tutorial/tutorial.h"
#include "components/user_education/common/tutorial/tutorial_description.h"
#include "components/user_education/common/tutorial/tutorial_identifier.h"
@@ -38,8 +38,8 @@
const {
DCHECK(tutorial_registry_.size() > 0);
std::vector<TutorialIdentifier> id_strings;
- base::ranges::transform(tutorial_registry_, std::back_inserter(id_strings),
- &Registry::value_type::first);
+ std::ranges::transform(tutorial_registry_, std::back_inserter(id_strings),
+ &Registry::value_type::first);
return id_strings;
}
diff --git a/components/user_manager/user_directory_integrity_manager.cc b/components/user_manager/user_directory_integrity_manager.cc
index a386b2d1..6fee0ad2 100644
--- a/components/user_manager/user_directory_integrity_manager.cc
+++ b/components/user_manager/user_directory_integrity_manager.cc
@@ -106,7 +106,7 @@
UserList users = UserManager::Get()->GetUsers();
auto misconfigured_user_it =
- base::ranges::find_if(users, [&misconfigured_user_email](User* user) {
+ std::ranges::find_if(users, [&misconfigured_user_email](User* user) {
return user->GetAccountId().GetUserEmail() ==
misconfigured_user_email.value();
});
diff --git a/components/user_manager/user_manager_impl.cc b/components/user_manager/user_manager_impl.cc
index 8852adeb..6016924 100644
--- a/components/user_manager/user_manager_impl.cc
+++ b/components/user_manager/user_manager_impl.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <memory>
#include <optional>
#include <set>
@@ -26,7 +27,6 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/system/sys_info.h"
@@ -357,8 +357,8 @@
if (active_user_->HasGaiaAccount()) {
// Move the user to the front of the list.
- auto it = base::ranges::find(users_, account_id,
- [](auto& ptr) { return ptr->GetAccountId(); });
+ auto it = std::ranges::find(users_, account_id,
+ [](auto& ptr) { return ptr->GetAccountId(); });
if (it != users_.end()) {
std::rotate(users_.begin(), it, it + 1);
ScopedListPrefUpdate prefs_users_update(local_state_.get(),
@@ -490,7 +490,7 @@
// Non device local account is not a target to be removed.
continue;
}
- if (base::ranges::any_of(
+ if (std::ranges::any_of(
device_local_accounts, [user](const DeviceLocalAccountInfo& info) {
return info.user_id == user->GetAccountId().GetUserEmail() &&
info.type == user->GetType();
@@ -1499,8 +1499,8 @@
// Find a User from `user_storage_`.
// FindUserAndModify may overlook some existing User instance, because
// the list may not contain ephemeral users that are getting stale.
- auto it = base::ranges::find(user_storage_, account_id,
- [](auto& ptr) { return ptr->GetAccountId(); });
+ auto it = std::ranges::find(user_storage_, account_id,
+ [](auto& ptr) { return ptr->GetAccountId(); });
auto* user = it == user_storage_.end() ? nullptr : it->get();
CHECK(user);
if (user->is_profile_created()) {
@@ -1529,8 +1529,8 @@
const AccountId& account_id) {
// Find from user_stroage_. See OnUserProfileCreated for the reason why not
// using FindUserAndModify.
- auto it = base::ranges::find(user_storage_, account_id,
- [](auto& ptr) { return ptr->GetAccountId(); });
+ auto it = std::ranges::find(user_storage_, account_id,
+ [](auto& ptr) { return ptr->GetAccountId(); });
auto* user = it == user_storage_.end() ? nullptr : it->get();
CHECK(user);
@@ -1702,7 +1702,7 @@
user->GetAccountId().GetUserEmail());
local_state_->CommitPendingWrite();
- UserList::iterator it = base::ranges::find(lru_logged_in_users_, user);
+ UserList::iterator it = std::ranges::find(lru_logged_in_users_, user);
if (it != lru_logged_in_users_.end()) {
lru_logged_in_users_.erase(it);
}
diff --git a/components/user_notes/storage/user_note_database_unittest.cc b/components/user_notes/storage/user_note_database_unittest.cc
index b671a30..e4c4594 100644
--- a/components/user_notes/storage/user_note_database_unittest.cc
+++ b/components/user_notes/storage/user_note_database_unittest.cc
@@ -4,13 +4,13 @@
#include "components/user_notes/storage/user_note_database.h"
+#include <algorithm>
#include <vector>
#include "base/containers/contains.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "components/user_notes/model/user_note_model_test_utils.h"
#include "sql/database.h"
#include "sql/meta_table.h"
@@ -246,7 +246,7 @@
EXPECT_EQ(3u, notes.size());
for (std::unique_ptr<UserNote>& note : notes) {
- const auto& vector_it = base::ranges::find(ids, note->id());
+ const auto& vector_it = std::ranges::find(ids, note->id());
EXPECT_NE(vector_it, ids.end());
EXPECT_NE(id_set.find(note->id()), id_set.end());
int i = vector_it - ids.begin();
diff --git a/components/variations/active_field_trials.cc b/components/variations/active_field_trials.cc
index 1ce3a05..78b7d6e 100644
--- a/components/variations/active_field_trials.cc
+++ b/components/variations/active_field_trials.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <string_view>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/metrics/field_trial.h"
#include "base/no_destructor.h"
#include "base/process/launch.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -153,8 +153,8 @@
std::vector<std::string> synthetic_trials;
variations::GetSyntheticTrialGroupIdsAsString(&synthetic_trials);
std::string trial_hash = variations::HashNameAsHexString(trial_name);
- return base::ranges::any_of(synthetic_trials, [&trial_hash](
- const auto& trial) {
+ return std::ranges::any_of(synthetic_trials, [&trial_hash](
+ const auto& trial) {
return base::StartsWith(trial, trial_hash, base::CompareCase::SENSITIVE);
});
}
diff --git a/components/variations/service/google_groups_manager.cc b/components/variations/service/google_groups_manager.cc
index 64a44187..0414b47 100644
--- a/components/variations/service/google_groups_manager.cc
+++ b/components/variations/service/google_groups_manager.cc
@@ -90,8 +90,8 @@
// No required Google Group for this experiment.
return true;
}
- return base::ranges::any_of(group_strings, [&user_groups = google_group_ids_](
- std::string_view group) {
+ return std::ranges::any_of(group_strings, [&user_groups = google_group_ids_](
+ std::string_view group) {
return user_groups.contains(group);
});
}
diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
index be6042e..84720a5e 100644
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <optional>
#include <string_view>
#include <utility>
@@ -22,7 +23,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
#include "base/values.h"
@@ -192,8 +192,8 @@
bool* is_delta_compressed,
bool* is_gzip_compressed) {
std::vector<std::string> ims = GetHeaderValuesList(headers, "IM");
- const auto delta_im = base::ranges::find(ims, "x-bm");
- const auto gzip_im = base::ranges::find(ims, "gzip");
+ const auto delta_im = std::ranges::find(ims, "x-bm");
+ const auto gzip_im = std::ranges::find(ims, "gzip");
*is_delta_compressed = delta_im != ims.end();
*is_gzip_compressed = gzip_im != ims.end();
diff --git a/components/variations/study_filtering.cc b/components/variations/study_filtering.cc
index 05d48fc..3a08727 100644
--- a/components/variations/study_filtering.cc
+++ b/components/variations/study_filtering.cc
@@ -31,7 +31,7 @@
template <typename Collection>
bool ContainsStringIgnoreCaseASCII(const Collection& collection,
const std::string& value) {
- return base::ranges::any_of(collection, [&value](const std::string& s) {
+ return std::ranges::any_of(collection, [&value](const std::string& s) {
return base::EqualsCaseInsensitiveASCII(s, value);
});
}
diff --git a/components/variations/variations_test_utils.cc b/components/variations/variations_test_utils.cc
index 3e3a513..5de803c 100644
--- a/components/variations/variations_test_utils.cc
+++ b/components/variations/variations_test_utils.cc
@@ -283,7 +283,7 @@
}
bool FieldTrialListHasAllStudiesFrom(const SignedSeedData& seed_data) {
- return base::ranges::all_of(seed_data.study_names, [](const char* study) {
+ return std::ranges::all_of(seed_data.study_names, [](const char* study) {
return base::FieldTrialList::TrialExists(study);
});
}
diff --git a/components/variations/variations_test_utils_unittest.cc b/components/variations/variations_test_utils_unittest.cc
index 5d4d9c82..40aee428d6 100644
--- a/components/variations/variations_test_utils_unittest.cc
+++ b/components/variations/variations_test_utils_unittest.cc
@@ -4,8 +4,9 @@
#include "components/variations/variations_test_utils.h"
+#include <algorithm>
+
#include "base/base64.h"
-#include "base/ranges/algorithm.h"
#include "components/variations/metrics.h"
#include "components/variations/proto/variations_seed.pb.h"
#include "components/variations/variations_seed_store.h"
@@ -60,8 +61,8 @@
VariationsSeed seed;
ASSERT_TRUE(seed.ParseFromString(decoded_uncompressed_data));
std::vector<std::string> parsed_study_names;
- base::ranges::transform(seed.study(), std::back_inserter(parsed_study_names),
- [](const Study& s) { return s.name(); });
+ std::ranges::transform(seed.study(), std::back_inserter(parsed_study_names),
+ [](const Study& s) { return s.name(); });
EXPECT_THAT(parsed_study_names, ::testing::UnorderedElementsAreArray(
signed_seed_data.study_names));
}
diff --git a/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc b/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc
index dd74192..7a5fdd6 100644
--- a/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc
+++ b/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc
@@ -183,7 +183,7 @@
void SortScoredAggregatesAndCallback(
std::vector<URLVisitAggregate> scored_visits,
VisitedURLRankingService::RankURLVisitAggregatesCallback callback) {
- base::ranges::stable_sort(scored_visits, [](const auto& c1, const auto& c2) {
+ std::ranges::stable_sort(scored_visits, [](const auto& c1, const auto& c2) {
// Sort such that higher scored entries precede lower scored entries.
return c1.score > c2.score;
});
diff --git a/components/viz/client/frame_eviction_manager_unittest.cc b/components/viz/client/frame_eviction_manager_unittest.cc
index cc192add..92ba618 100644
--- a/components/viz/client/frame_eviction_manager_unittest.cc
+++ b/components/viz/client/frame_eviction_manager_unittest.cc
@@ -4,11 +4,11 @@
#include "components/viz/client/frame_eviction_manager.h"
+#include <algorithm>
#include <vector>
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/raw_ptr.h"
-#include "base/ranges/algorithm.h"
#include "base/test/test_mock_time_task_runner.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -64,14 +64,14 @@
manager->AddFrame(&frame, /*locked=*/false);
// All frames stays because |scoped_pause| holds off frame eviction.
- EXPECT_EQ(kFrames, base::ranges::count_if(
+ EXPECT_EQ(kFrames, std::ranges::count_if(
frames, &TestFrameEvictionManagerClient::has_frame));
}
// Frame eviction happens when |scoped_pause| goes out of scope.
EXPECT_EQ(kMaxSavedFrames,
- base::ranges::count_if(frames,
- &TestFrameEvictionManagerClient::has_frame));
+ std::ranges::count_if(frames,
+ &TestFrameEvictionManagerClient::has_frame));
}
TEST_F(FrameEvictionManagerTest, PeriodicCulling) {
diff --git a/components/viz/client/frame_evictor.cc b/components/viz/client/frame_evictor.cc
index 1b6ba0c..15c2b54 100644
--- a/components/viz/client/frame_evictor.cc
+++ b/components/viz/client/frame_evictor.cc
@@ -68,7 +68,7 @@
output_ids.push_back(ids.ui_compositor_id);
}
- base::ranges::sort(output_ids.begin(), output_ids.end());
+ std::ranges::sort(output_ids.begin(), output_ids.end());
return output_ids;
}
diff --git a/components/viz/common/frame_sinks/copy_output_request.cc b/components/viz/common/frame_sinks/copy_output_request.cc
index 7d05ca6..38fecaa 100644
--- a/components/viz/common/frame_sinks/copy_output_request.cc
+++ b/components/viz/common/frame_sinks/copy_output_request.cc
@@ -4,11 +4,11 @@
#include "components/viz/common/frame_sinks/copy_output_request.h"
+#include <algorithm>
#include <utility>
#include "base/check_op.h"
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
diff --git a/components/viz/host/client_frame_sink_video_capturer.cc b/components/viz/host/client_frame_sink_video_capturer.cc
index 865dc9f8..67aeb72 100644
--- a/components/viz/host/client_frame_sink_video_capturer.cc
+++ b/components/viz/host/client_frame_sink_video_capturer.cc
@@ -4,11 +4,11 @@
#include "components/viz/host/client_frame_sink_video_capturer.h"
+#include <algorithm>
#include <utility>
#include "base/functional/bind.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "media/capture/mojom/video_capture_buffer.mojom.h"
#include "media/capture/mojom/video_capture_types.mojom.h"
@@ -132,7 +132,7 @@
// If there is an existing overlay at the same index, drop it.
auto it =
- base::ranges::find(overlays_, stacking_index, &Overlay::stacking_index);
+ std::ranges::find(overlays_, stacking_index, &Overlay::stacking_index);
if (it != overlays_.end()) {
(*it)->DisconnectPermanently();
overlays_.erase(it);
@@ -245,7 +245,7 @@
void ClientFrameSinkVideoCapturer::OnOverlayDestroyed(Overlay* overlay) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- const auto it = base::ranges::find(overlays_, overlay);
+ const auto it = std::ranges::find(overlays_, overlay);
CHECK(it != overlays_.end(), base::NotFatalUntil::M130);
overlays_.erase(it);
}
diff --git a/components/viz/service/display/dc_layer_overlay.cc b/components/viz/service/display/dc_layer_overlay.cc
index 277b67aa..505a669 100644
--- a/components/viz/service/display/dc_layer_overlay.cc
+++ b/components/viz/service/display/dc_layer_overlay.cc
@@ -316,7 +316,7 @@
// underlay.
bool is_overlay = true;
for (auto& [render_pass, overlay_data] : render_pass_overlay_data_map) {
- is_overlay = base::ranges::all_of(
+ is_overlay = std::ranges::all_of(
overlay_data.promoted_overlays,
[](const auto& dc_layer) { return dc_layer.plane_z_order > 0; });
if (!is_overlay) {
@@ -324,7 +324,7 @@
}
}
- bool damage_rects_empty = base::ranges::all_of(
+ bool damage_rects_empty = std::ranges::all_of(
render_pass_overlay_data_map,
[](const auto& data) { return data.second.damage_rect.IsEmpty(); });
diff --git a/components/viz/service/display/display.cc b/components/viz/service/display/display.cc
index e7e0ef2..5bea765 100644
--- a/components/viz/service/display/display.cc
+++ b/components/viz/service/display/display.cc
@@ -18,7 +18,6 @@
#include "base/debug/dump_without_crashing.h"
#include "base/metrics/histogram_macros.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/common/task_annotator.h"
diff --git a/components/viz/service/display/draw_polygon.cc b/components/viz/service/display/draw_polygon.cc
index bd35dfb..58aaf79 100644
--- a/components/viz/service/display/draw_polygon.cc
+++ b/components/viz/service/display/draw_polygon.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <algorithm>
#include <array>
#include <cmath>
#include <utility>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "cc/base/math_util.h"
#include "components/viz/common/quads/draw_quad.h"
@@ -241,15 +241,15 @@
size_t pre_back_begin;
// Find the first vertex that is part of the front split polygon.
- front_begin = base::ranges::find_if(vertex_distance,
- [](float val) { return val > 0.0; }) -
+ front_begin = std::ranges::find_if(vertex_distance,
+ [](float val) { return val > 0.0; }) -
vertex_distance.begin();
while (vertex_distance[pre_front_begin = prev(front_begin)] > 0.0)
front_begin = pre_front_begin;
// Find the first vertex that is part of the back split polygon.
- back_begin = base::ranges::find_if(vertex_distance,
- [](float val) { return val < 0.0; }) -
+ back_begin = std::ranges::find_if(vertex_distance,
+ [](float val) { return val < 0.0; }) -
vertex_distance.begin();
while (vertex_distance[pre_back_begin = prev(back_begin)] < 0.0)
back_begin = pre_back_begin;
diff --git a/components/viz/service/display/occlusion_culler.cc b/components/viz/service/display/occlusion_culler.cc
index 8d6aa14..200e199 100644
--- a/components/viz/service/display/occlusion_culler.cc
+++ b/components/viz/service/display/occlusion_culler.cc
@@ -183,7 +183,7 @@
CHECK(reduced_region_out.empty());
for (gfx::Rect r : region) {
- auto it = base::ranges::find_if(
+ auto it = std::ranges::find_if(
reduced_region_out,
[&r](const gfx::Rect& a) { return a.SharesEdgeWith(r); });
diff --git a/components/viz/service/display/overlay_dc_unittest.cc b/components/viz/service/display/overlay_dc_unittest.cc
index b20b15d..8c720377 100644
--- a/components/viz/service/display/overlay_dc_unittest.cc
+++ b/components/viz/service/display/overlay_dc_unittest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include <functional>
#include <memory>
#include <utility>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/containers/flat_map.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
-#include "base/ranges/functional.h"
#include "base/strings/stringprintf.h"
#include "base/test/bind.h"
#include "base/test/scoped_feature_list.h"
@@ -305,9 +305,8 @@
// |DCLayerOverlayProcessor::Process| doesn't guarantee a specific ordering
// for its overlays so we sort front-to-back so tests can make expectations
// with the same ordering as the input draw quads.
- base::ranges::sort(root_render_pass_overlay_data.promoted_overlays,
- base::ranges::greater(),
- &OverlayCandidate::plane_z_order);
+ std::ranges::sort(root_render_pass_overlay_data.promoted_overlays,
+ std::ranges::greater(), &OverlayCandidate::plane_z_order);
return std::move(root_render_pass_overlay_data);
}
@@ -2376,8 +2375,8 @@
pass_list_->back()->damage_rect.Intersect(*damage_rect_);
const AggregatedRenderPassId max_pass_id =
- base::ranges::max_element(*pass_list_, base::ranges::less(),
- &AggregatedRenderPass::id)
+ std::ranges::max_element(*pass_list_, std::ranges::less(),
+ &AggregatedRenderPass::id)
->get()
->id;
const AggregatedRenderPassId unused_pass_id(max_pass_id.value() + 1);
@@ -2421,7 +2420,7 @@
~ScopedSimulateUnmergedWebContentsSurface() {
auto it =
- base::ranges::find_if(*candidates_, [](const auto& candidate) {
+ std::ranges::find_if(*candidates_, [](const auto& candidate) {
return candidate.rpdq &&
candidate.rpdq->render_pass_id == kDefaultRootPassId;
});
@@ -2462,8 +2461,8 @@
// Sort candidates front-to-back so tests can assume they appear in the same
// order as the input draw quads.
- base::ranges::sort(*candidates, base::ranges::greater(),
- &OverlayCandidate::plane_z_order);
+ std::ranges::sort(*candidates, std::ranges::greater(),
+ &OverlayCandidate::plane_z_order);
}
private:
diff --git a/components/viz/service/display/overlay_processor_using_strategy.cc b/components/viz/service/display/overlay_processor_using_strategy.cc
index 2ad06d8..e0a07f9 100644
--- a/components/viz/service/display/overlay_processor_using_strategy.cc
+++ b/components/viz/service/display/overlay_processor_using_strategy.cc
@@ -24,7 +24,6 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
@@ -178,7 +177,7 @@
return false;
}
- return base::ranges::any_of(
+ return std::ranges::any_of(
mask_candidates.begin(), mask_candidates.end(),
[&candidate](const auto& iter) {
return candidate.occluding_mask_keys.contains(
@@ -518,7 +517,7 @@
curr_surface_damage.Intersect(existing_damage);
// Only add damage back in if it is not occluded by any overlays.
- bool is_occluded = base::ranges::any_of(
+ bool is_occluded = std::ranges::any_of(
occluding_rects, [&curr_surface_damage](const gfx::Rect& occluder) {
return occluder.Contains(curr_surface_damage);
});
@@ -959,7 +958,7 @@
// After sorting in `SortProposedOverlayCandidates()`, all the candidates with
// display masks will be in the beginning of `sorted_candidates`.
ConstOverlayProposedCandidateIterator first_candidate_without_masks =
- base::ranges::find_if(
+ std::ranges::find_if(
sorted_candidates.begin(), sorted_candidates.end(),
[](const OverlayProposedCandidate& candidate) {
return !candidate.candidate.has_rounded_display_masks;
diff --git a/components/viz/service/display/overlay_processor_win.cc b/components/viz/service/display/overlay_processor_win.cc
index a5ead1eb..9d36cae 100644
--- a/components/viz/service/display/overlay_processor_win.cc
+++ b/components/viz/service/display/overlay_processor_win.cc
@@ -4,6 +4,8 @@
#include "components/viz/service/display/overlay_processor_win.h"
+#include <algorithm>
+#include <functional>
#include <memory>
#include <optional>
#include <utility>
@@ -12,8 +14,6 @@
#include "base/check.h"
#include "base/feature_list.h"
#include "base/memory/raw_ptr_exclusion.h"
-#include "base/ranges/algorithm.h"
-#include "base/ranges/functional.h"
#include "base/trace_event/trace_event.h"
#include "base/types/expected.h"
#include "components/viz/common/display/renderer_settings.h"
@@ -264,12 +264,12 @@
frames_since_using_dc_layers_map_,
[&surface_content_render_passes](const auto& frames_since_kv) {
const auto& [pass_id, _num_frames] = frames_since_kv;
- return base::ranges::none_of(surface_content_render_passes,
- [&pass_id](const auto& overlay_data_kv) {
- const auto& [pass, _data] =
- overlay_data_kv;
- return pass_id == pass->id;
- });
+ return std::ranges::none_of(surface_content_render_passes,
+ [&pass_id](const auto& overlay_data_kv) {
+ const auto& [pass, _data] =
+ overlay_data_kv;
+ return pass_id == pass->id;
+ });
});
for (auto& [render_pass, overlay_data] : surface_content_render_passes) {
@@ -562,8 +562,8 @@
// compositing.
if (dc_layer->rpdq) {
auto render_pass_it =
- base::ranges::find(render_passes, dc_layer->rpdq->render_pass_id,
- &AggregatedRenderPass::id);
+ std::ranges::find(render_passes, dc_layer->rpdq->render_pass_id,
+ &AggregatedRenderPass::id);
CHECK(render_pass_it != render_passes.end());
result.promoted_render_passes_info.promoted_render_passes.insert(
@@ -623,7 +623,7 @@
}
// Check if any embedders need to read the backing.
- if (base::ranges::any_of(embedders, [](const auto& embedder) {
+ if (std::ranges::any_of(embedders, [](const auto& embedder) {
if (!embedder.is_overlay) {
// Non-overlay embedders need to be read in viz
return true;
@@ -664,7 +664,7 @@
for (const auto* quad : pass->quad_list) {
if (const auto* rpdq =
quad->DynamicCast<AggregatedRenderPassDrawQuad>()) {
- auto it = base::ranges::find(
+ auto it = std::ranges::find(
promoted_render_passes_info.promoted_render_passes,
rpdq->render_pass_id, &AggregatedRenderPass ::id);
if (it == promoted_render_passes_info.promoted_render_passes.end()) {
@@ -675,7 +675,7 @@
embedders[(*it)->id].push_back(Embedder{
.rpdq = rpdq,
- .is_overlay = base::ranges::find(
+ .is_overlay = std::ranges::find(
promoted_render_passes_info.promoted_rpdqs, rpdq,
[](const auto& rpdq) { return &rpdq.get(); }) !=
promoted_render_passes_info.promoted_rpdqs.end(),
@@ -728,7 +728,7 @@
const OverlayCandidate& candidate)
-> DCLayerOverlayProcessor::RenderPassOverlayDataMap::value_type* {
if (candidate.rpdq) {
- if (auto it = base::ranges::find(
+ if (auto it = std::ranges::find(
surface_content_render_passes, candidate.rpdq->render_pass_id,
[](const auto& kv) { return kv.first->id; });
it != surface_content_render_passes.end()) {
@@ -809,8 +809,8 @@
auto& [render_pass, overlay_data] = *surface_content_overlay_data;
// Sort the child overlays so we can iterate them back-to-front.
- base::ranges::sort(overlay_data.promoted_overlays, base::ranges::less(),
- &OverlayCandidate::plane_z_order);
+ std::ranges::sort(overlay_data.promoted_overlays, std::ranges::less(),
+ &OverlayCandidate::plane_z_order);
const gfx::Rect surface_bounds_in_root = gfx::ToRoundedRect(
OverlayCandidate::DisplayRectInTargetSpace(candidates[rpdq_index]));
diff --git a/components/viz/service/display/renderer_pixeltest.cc b/components/viz/service/display/renderer_pixeltest.cc
index 2cbaad2..22169f2 100644
--- a/components/viz/service/display/renderer_pixeltest.cc
+++ b/components/viz/service/display/renderer_pixeltest.cc
@@ -22,7 +22,6 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/shared_memory_mapping.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/time/time.h"
@@ -330,7 +329,7 @@
reinterpret_cast<uint32_t*>(mapping->GetMemoryForPlane(0).data());
base::span<uint32_t> span = UNSAFE_BUFFERS(base::span(ptr, pixels.size()));
- base::ranges::copy(pixels, span.begin());
+ std::ranges::copy(pixels, span.begin());
}
// Return the mapped resource id.
@@ -399,7 +398,7 @@
reinterpret_cast<uint32_t*>(mapping->GetMemoryForPlane(0).data());
base::span<uint32_t> span = UNSAFE_BUFFERS(base::span(ptr, pixels.size()));
- base::ranges::copy(pixels, span.begin());
+ std::ranges::copy(pixels, span.begin());
}
// Return the mapped resource id.
diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc
index 40b3dd3..3049b931 100644
--- a/components/viz/service/display/skia_renderer.cc
+++ b/components/viz/service/display/skia_renderer.cc
@@ -4,6 +4,7 @@
#include "components/viz/service/display/skia_renderer.h"
+#include <algorithm>
#include <array>
#include <limits>
#include <optional>
@@ -22,7 +23,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
#include "base/numerics/angle_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/task/bind_post_task.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
@@ -2069,11 +2069,11 @@
}
const auto nested_render_pass_id = render_pass_quad->render_pass_id;
- auto it = base::ranges::find_if(
- *current_frame()->render_passes_in_draw_order,
- [&nested_render_pass_id](const auto& render_pass) {
- return render_pass->id == nested_render_pass_id;
- });
+ auto it =
+ std::ranges::find_if(*current_frame()->render_passes_in_draw_order,
+ [&nested_render_pass_id](const auto& render_pass) {
+ return render_pass->id == nested_render_pass_id;
+ });
CHECK(it != current_frame()->render_passes_in_draw_order->end(),
base::NotFatalUntil::M130);
@@ -3336,8 +3336,8 @@
base::JoinString(pass_ids, ","));
auto it =
- base::ranges::find(*current_frame()->render_passes_in_draw_order,
- quad->render_pass_id, &AggregatedRenderPass::id);
+ std::ranges::find(*current_frame()->render_passes_in_draw_order,
+ quad->render_pass_id, &AggregatedRenderPass::id);
SCOPED_CRASH_KEY_STRING256(
"missing rp backing", "11-rp transform",
it != current_frame()->render_passes_in_draw_order->end()
@@ -3751,8 +3751,8 @@
if (backing_it->second.is_scanout) {
if (DCHECK_IS_ON()) {
auto pass_it =
- base::ranges::find(*current_frame()->render_passes_in_draw_order,
- backing_it->first, &AggregatedRenderPass::id);
+ std::ranges::find(*current_frame()->render_passes_in_draw_order,
+ backing_it->first, &AggregatedRenderPass::id);
CHECK(pass_it != current_frame()->render_passes_in_draw_order->end());
DCHECK(!pass_it->get()->generate_mipmap);
@@ -3782,14 +3782,14 @@
gfx::ColorSpace color_space,
const gfx::Size& buffer_size) {
RenderPassOverlayParams overlay_params;
- auto it = base::ranges::find_if(available_render_pass_overlay_backings_,
- [&buffer_format, &buffer_size, &color_space](
- const RenderPassOverlayParams& overlay) {
- auto& backing = overlay.render_pass_backing;
- return backing.format == buffer_format &&
- backing.size == buffer_size &&
- backing.color_space == color_space;
- });
+ auto it = std::ranges::find_if(available_render_pass_overlay_backings_,
+ [&buffer_format, &buffer_size, &color_space](
+ const RenderPassOverlayParams& overlay) {
+ auto& backing = overlay.render_pass_backing;
+ return backing.format == buffer_format &&
+ backing.size == buffer_size &&
+ backing.color_space == color_space;
+ });
if (it == available_render_pass_overlay_backings_.end()) {
// Allocate the image for render pass overlay if there is no existing
// available one.
@@ -4345,10 +4345,10 @@
CHECK(!mailbox_.IsZero());
auto it =
- base::ranges::find(renderer_->in_flight_render_pass_overlay_backings_,
- mailbox_, [](const RenderPassOverlayParams& overlay) {
- return overlay.render_pass_backing.mailbox;
- });
+ std::ranges::find(renderer_->in_flight_render_pass_overlay_backings_,
+ mailbox_, [](const RenderPassOverlayParams& overlay) {
+ return overlay.render_pass_backing.mailbox;
+ });
CHECK(it != renderer_->in_flight_render_pass_overlay_backings_.end());
it->ref_count++;
@@ -4360,10 +4360,10 @@
}
auto it =
- base::ranges::find(renderer_->in_flight_render_pass_overlay_backings_,
- mailbox_, [](const RenderPassOverlayParams& overlay) {
- return overlay.render_pass_backing.mailbox;
- });
+ std::ranges::find(renderer_->in_flight_render_pass_overlay_backings_,
+ mailbox_, [](const RenderPassOverlayParams& overlay) {
+ return overlay.render_pass_backing.mailbox;
+ });
CHECK(it != renderer_->in_flight_render_pass_overlay_backings_.end());
// Render pass overlay backings can be reused across multiple frames so we
diff --git a/components/viz/service/display/surface_aggregator.cc b/components/viz/service/display/surface_aggregator.cc
index 109063a..f5b752b 100644
--- a/components/viz/service/display/surface_aggregator.cc
+++ b/components/viz/service/display/surface_aggregator.cc
@@ -1034,8 +1034,8 @@
features::kAllowForceMergeRenderPassWithRequireOverlayQuads);
const bool force_merge_pass =
allow_forced_merge_pass && !merge_pass && pass_is_mergeable &&
- base::ranges::any_of(dest_pass_list_->back()->quad_list,
- &OverlayCandidate::RequiresOverlay);
+ std::ranges::any_of(dest_pass_list_->back()->quad_list,
+ &OverlayCandidate::RequiresOverlay);
if (merge_pass || force_merge_pass) {
// Compute a clip rect in |dest_pass| coordinate space to ensure merged
diff --git a/components/viz/service/display_embedder/image_context_impl.cc b/components/viz/service/display_embedder/image_context_impl.cc
index 1bce189..960307c5 100644
--- a/components/viz/service/display_embedder/image_context_impl.cc
+++ b/components/viz/service/display_embedder/image_context_impl.cc
@@ -222,7 +222,7 @@
if (context_state->graphite_context()) {
const auto& tex_infos = texture_infos();
if (tex_infos.size() != static_cast<size_t>(num_planes) ||
- base::ranges::any_of(tex_infos, [](const auto& tex_info) {
+ std::ranges::any_of(tex_infos, [](const auto& tex_info) {
return !tex_info.isValid();
})) {
DLOG(ERROR) << "Invalid Graphite texture infos for format: "
diff --git a/components/viz/service/frame_sinks/compositor_frame_sink_support.cc b/components/viz/service/frame_sinks/compositor_frame_sink_support.cc
index 18ef43f..4216186 100644
--- a/components/viz/service/frame_sinks/compositor_frame_sink_support.cc
+++ b/components/viz/service/frame_sinks/compositor_frame_sink_support.cc
@@ -14,7 +14,6 @@
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/system/sys_info.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
@@ -1369,7 +1368,7 @@
void CompositorFrameSinkSupport::DetachCaptureClient(
CapturableFrameSink::Client* client) {
- const auto it = base::ranges::find(capture_clients_, client);
+ const auto it = std::ranges::find(capture_clients_, client);
if (it != capture_clients_.end())
capture_clients_.erase(it);
if (client->IsVideoCaptureStarted())
diff --git a/components/viz/service/surfaces/surface.cc b/components/viz/service/surfaces/surface.cc
index 98eadabd..b715544cb 100644
--- a/components/viz/service/surfaces/surface.cc
+++ b/components/viz/service/surfaces/surface.cc
@@ -16,7 +16,6 @@
#include "base/containers/contains.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
-#include "base/ranges/algorithm.h"
#include "base/time/tick_clock.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/traced_value.h"
@@ -885,8 +884,8 @@
frame->metadata.latency_info.swap(*latency_info);
return;
}
- base::ranges::copy(frame->metadata.latency_info,
- std::back_inserter(*latency_info));
+ std::ranges::copy(frame->metadata.latency_info,
+ std::back_inserter(*latency_info));
frame->metadata.latency_info.clear();
if (!ui::LatencyInfo::Verify(*latency_info,
"Surface::TakeLatencyInfoFromFrame")) {
diff --git a/components/viz/service/surfaces/surface_allocation_group.cc b/components/viz/service/surfaces/surface_allocation_group.cc
index e71e5e0f..34756332 100644
--- a/components/viz/service/surfaces/surface_allocation_group.cc
+++ b/components/viz/service/surfaces/surface_allocation_group.cc
@@ -4,12 +4,12 @@
#include "components/viz/service/surfaces/surface_allocation_group.h"
+#include <algorithm>
#include <numeric>
#include <utility>
#include "base/memory/raw_ptr.h"
#include "base/not_fatal_until.h"
-#include "base/ranges/algorithm.h"
#include "components/viz/service/surfaces/surface.h"
#include "components/viz/service/surfaces/surface_manager.h"
@@ -44,7 +44,7 @@
}
void SurfaceAllocationGroup::UnregisterSurface(Surface* surface) {
- auto it = base::ranges::find(surfaces_, surface);
+ auto it = std::ranges::find(surfaces_, surface);
CHECK(it != surfaces_.end(), base::NotFatalUntil::M130);
surfaces_.erase(it);
MaybeMarkForDestruction();
diff --git a/components/viz/service/surfaces/surface_manager.cc b/components/viz/service/surfaces/surface_manager.cc
index ec136a2..3e86ae60 100644
--- a/components/viz/service/surfaces/surface_manager.cc
+++ b/components/viz/service/surfaces/surface_manager.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <string_view>
#include <utility>
#include <vector>
@@ -17,7 +18,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/not_fatal_until.h"
#include "base/observer_list.h"
-#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/default_tick_clock.h"
#include "base/trace_event/trace_event.h"
diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc
index d809e2a..472ba00 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager.cc
@@ -4,10 +4,10 @@
#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include <algorithm>
#include <utility>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "components/back_forward_cache/back_forward_cache_disable.h"
#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
#include "content/public/browser/back_forward_cache.h"
@@ -73,7 +73,7 @@
}
void WebContentsModalDialogManager::WillClose(gfx::NativeWindow dialog) {
- auto dlg = base::ranges::find(child_dialogs_, dialog, &DialogState::dialog);
+ auto dlg = std::ranges::find(child_dialogs_, dialog, &DialogState::dialog);
// The Views tab contents modal dialog calls WillClose twice. Ignore the
// second invocation.
diff --git a/components/web_package/signed_web_bundles/ecdsa_p256_public_key.cc b/components/web_package/signed_web_bundles/ecdsa_p256_public_key.cc
index 057f567..c1dce64 100644
--- a/components/web_package/signed_web_bundles/ecdsa_p256_public_key.cc
+++ b/components/web_package/signed_web_bundles/ecdsa_p256_public_key.cc
@@ -4,8 +4,9 @@
#include "components/web_package/signed_web_bundles/ecdsa_p256_public_key.h"
+#include <algorithm>
+
#include "base/containers/span.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "components/web_package/signed_web_bundles/ecdsa_p256_utils.h"
@@ -28,7 +29,7 @@
}
std::array<uint8_t, kLength> key;
- base::ranges::copy(key_bytes, key.begin());
+ std::ranges::copy(key_bytes, key.begin());
return EcdsaP256PublicKey(std::move(key));
}
diff --git a/components/web_package/signed_web_bundles/ecdsa_p256_sha256_signature.cc b/components/web_package/signed_web_bundles/ecdsa_p256_sha256_signature.cc
index 060dfa3..8f961fc 100644
--- a/components/web_package/signed_web_bundles/ecdsa_p256_sha256_signature.cc
+++ b/components/web_package/signed_web_bundles/ecdsa_p256_sha256_signature.cc
@@ -8,7 +8,8 @@
#include "components/web_package/signed_web_bundles/ecdsa_p256_sha256_signature.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/stringprintf.h"
#include "base/types/expected.h"
#include "components/web_package/signed_web_bundles/ecdsa_p256_public_key.h"
diff --git a/components/web_package/signed_web_bundles/ed25519_public_key.cc b/components/web_package/signed_web_bundles/ed25519_public_key.cc
index c488d6be..44f7664 100644
--- a/components/web_package/signed_web_bundles/ed25519_public_key.cc
+++ b/components/web_package/signed_web_bundles/ed25519_public_key.cc
@@ -4,7 +4,8 @@
#include "components/web_package/signed_web_bundles/ed25519_public_key.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/stringprintf.h"
#include "base/types/expected.h"
#include "third_party/boringssl/src/include/openssl/curve25519.h"
@@ -47,7 +48,7 @@
Ed25519PublicKey Ed25519PublicKey::Create(
base::span<const uint8_t, kLength> key) {
std::array<uint8_t, kLength> bytes;
- base::ranges::copy(key, bytes.begin());
+ std::ranges::copy(key, bytes.begin());
return Ed25519PublicKey(std::move(bytes));
}
diff --git a/components/web_package/signed_web_bundles/ed25519_signature.cc b/components/web_package/signed_web_bundles/ed25519_signature.cc
index 85bdced..d97611d 100644
--- a/components/web_package/signed_web_bundles/ed25519_signature.cc
+++ b/components/web_package/signed_web_bundles/ed25519_signature.cc
@@ -4,7 +4,8 @@
#include "components/web_package/signed_web_bundles/ed25519_signature.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "base/strings/stringprintf.h"
#include "third_party/boringssl/src/include/openssl/curve25519.h"
@@ -39,7 +40,7 @@
Ed25519Signature Ed25519Signature::Create(
base::span<const uint8_t, kLength> bytes) {
std::array<uint8_t, kLength> array;
- base::ranges::copy(bytes, array.begin());
+ std::ranges::copy(bytes, array.begin());
return Ed25519Signature(array);
}
diff --git a/components/web_package/signed_web_bundles/ed25519_signature_unittest.cc b/components/web_package/signed_web_bundles/ed25519_signature_unittest.cc
index aaf31ad..7f2f322 100644
--- a/components/web_package/signed_web_bundles/ed25519_signature_unittest.cc
+++ b/components/web_package/signed_web_bundles/ed25519_signature_unittest.cc
@@ -4,10 +4,10 @@
#include "components/web_package/signed_web_bundles/ed25519_signature.h"
+#include <algorithm>
#include <vector>
#include "base/containers/span.h"
-#include "base/ranges/algorithm.h"
#include "base/test/gmock_expected_support.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -78,12 +78,12 @@
bytes[3] = 123;
ASSERT_OK_AND_ASSIGN(auto signature, Ed25519Signature::Create(bytes));
- EXPECT_TRUE(base::ranges::equal(bytes, signature.bytes()));
+ EXPECT_TRUE(std::ranges::equal(bytes, signature.bytes()));
}
TEST(Ed25519SignatureTest, ValidSignatureFromArray) {
auto signature = Ed25519Signature::Create(base::span(kSignature));
- EXPECT_TRUE(base::ranges::equal(base::span(kSignature), signature.bytes()));
+ EXPECT_TRUE(std::ranges::equal(base::span(kSignature), signature.bytes()));
}
TEST(Ed25519SignatureTest, Equality) {
diff --git a/components/web_package/signed_web_bundles/identity_validator.cc b/components/web_package/signed_web_bundles/identity_validator.cc
index 62ec3aa..8a8cbba8 100644
--- a/components/web_package/signed_web_bundles/identity_validator.cc
+++ b/components/web_package/signed_web_bundles/identity_validator.cc
@@ -4,8 +4,9 @@
#include "components/web_package/signed_web_bundles/identity_validator.h"
+#include <algorithm>
+
#include "base/no_destructor.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "components/web_package/signed_web_bundles/ecdsa_p256_public_key.h"
#include "components/web_package/signed_web_bundles/ed25519_public_key.h"
@@ -46,7 +47,7 @@
base::expected<void, std::string> IdentityValidator::ValidateWebBundleIdentity(
const std::string& web_bundle_id,
const std::vector<PublicKey>& public_keys) const {
- if (!base::ranges::any_of(public_keys, [&](const auto& public_key) {
+ if (!std::ranges::any_of(public_keys, [&](const auto& public_key) {
return absl::visit(
[&](const auto& public_key) {
return SignedWebBundleId::CreateForPublicKey(public_key).id() ==
diff --git a/components/web_package/signed_web_bundles/signed_web_bundle_id.cc b/components/web_package/signed_web_bundles/signed_web_bundle_id.cc
index 23462f2..e38d1bc3 100644
--- a/components/web_package/signed_web_bundles/signed_web_bundle_id.cc
+++ b/components/web_package/signed_web_bundles/signed_web_bundle_id.cc
@@ -4,12 +4,12 @@
#include "components/web_package/signed_web_bundles/signed_web_bundle_id.h"
+#include <algorithm>
#include <ostream>
#include <string_view>
#include "base/containers/span.h"
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/types/expected.h"
@@ -48,7 +48,7 @@
}
auto type_suffix = base::span(decoded_id).last<kTypeSuffixLength>();
- if (base::ranges::equal(type_suffix, kTypeProxyMode)) {
+ if (std::ranges::equal(type_suffix, kTypeProxyMode)) {
if (decoded_id.size() == kProxyModeDecodedIdLength) {
return SignedWebBundleId(Type::kProxyMode, encoded_id);
} else {
@@ -58,7 +58,7 @@
kProxyModeEncodedIdLength, encoded_id.size()));
}
}
- if (base::ranges::equal(type_suffix, kTypeEd25519PublicKey)) {
+ if (std::ranges::equal(type_suffix, kTypeEd25519PublicKey)) {
if (decoded_id.size() == kEd25519DecodedIdLength) {
return SignedWebBundleId(Type::kEd25519PublicKey, encoded_id);
} else {
@@ -68,7 +68,7 @@
kEd25519EncodedIdLength, encoded_id.size()));
}
}
- if (base::ranges::equal(type_suffix, kTypeEcdsaP256PublicKey)) {
+ if (std::ranges::equal(type_suffix, kTypeEcdsaP256PublicKey)) {
if (decoded_id.size() == kEcdsaP256DecodedIdLength) {
return SignedWebBundleId(Type::kEcdsaP256PublicKey, encoded_id);
} else {
@@ -85,9 +85,9 @@
SignedWebBundleId SignedWebBundleId::CreateForPublicKey(
const Ed25519PublicKey& public_key) {
std::array<uint8_t, kEd25519DecodedIdLength> decoded_id;
- base::ranges::copy(public_key.bytes(), decoded_id.begin());
- base::ranges::copy(kTypeEd25519PublicKey,
- decoded_id.end() - kTypeSuffixLength);
+ std::ranges::copy(public_key.bytes(), decoded_id.begin());
+ std::ranges::copy(kTypeEd25519PublicKey,
+ decoded_id.end() - kTypeSuffixLength);
auto encoded_id_uppercase = base32::Base32Encode(
decoded_id, base32::Base32EncodePolicy::OMIT_PADDING);
@@ -99,9 +99,9 @@
SignedWebBundleId SignedWebBundleId::CreateForPublicKey(
const EcdsaP256PublicKey& public_key) {
std::array<uint8_t, kEcdsaP256DecodedIdLength> decoded_id;
- base::ranges::copy(public_key.bytes(), decoded_id.begin());
- base::ranges::copy(kTypeEcdsaP256PublicKey,
- decoded_id.end() - kTypeSuffixLength);
+ std::ranges::copy(public_key.bytes(), decoded_id.begin());
+ std::ranges::copy(kTypeEcdsaP256PublicKey,
+ decoded_id.end() - kTypeSuffixLength);
auto encoded_id_uppercase = base32::Base32Encode(
decoded_id, base32::Base32EncodePolicy::OMIT_PADDING);
@@ -113,8 +113,8 @@
SignedWebBundleId SignedWebBundleId::CreateForProxyMode(
base::span<const uint8_t, kProxyModeKeyLength> data) {
std::array<uint8_t, kProxyModeKeyLength + kTypeSuffixLength> decoded_id;
- base::ranges::copy(data, decoded_id.begin());
- base::ranges::copy(kTypeProxyMode, decoded_id.end() - kTypeSuffixLength);
+ std::ranges::copy(data, decoded_id.begin());
+ std::ranges::copy(kTypeProxyMode, decoded_id.end() - kTypeSuffixLength);
auto encoded_id_uppercase = base32::Base32Encode(
decoded_id, base32::Base32EncodePolicy::OMIT_PADDING);
diff --git a/components/web_package/signed_web_bundles/signed_web_bundle_id_unittest.cc b/components/web_package/signed_web_bundles/signed_web_bundle_id_unittest.cc
index 748fc65..ea83f61f 100644
--- a/components/web_package/signed_web_bundles/signed_web_bundle_id_unittest.cc
+++ b/components/web_package/signed_web_bundles/signed_web_bundle_id_unittest.cc
@@ -4,6 +4,7 @@
#include "components/web_package/signed_web_bundles/signed_web_bundle_id.h"
+#include <algorithm>
#include <array>
#include <optional>
#include <string_view>
@@ -11,7 +12,6 @@
#include <utility>
#include "base/containers/span.h"
-#include "base/ranges/algorithm.h"
#include "base/test/bind.h"
#include "base/test/gmock_expected_support.h"
#include "components/web_package/signed_web_bundles/ecdsa_p256_public_key.h"
diff --git a/components/web_package/signed_web_bundles/signed_web_bundle_signature_stack.cc b/components/web_package/signed_web_bundles/signed_web_bundle_signature_stack.cc
index 77acdaf..8d63ffe 100644
--- a/components/web_package/signed_web_bundles/signed_web_bundle_signature_stack.cc
+++ b/components/web_package/signed_web_bundles/signed_web_bundle_signature_stack.cc
@@ -4,10 +4,11 @@
#include "components/web_package/signed_web_bundles/signed_web_bundle_signature_stack.h"
+#include <algorithm>
+
#include "base/containers/span.h"
#include "base/containers/to_vector.h"
#include "base/functional/overloaded.h"
-#include "base/ranges/algorithm.h"
#include "base/types/expected.h"
#include "components/web_package/mojom/web_bundle_parser.mojom.h"
#include "components/web_package/signed_web_bundles/signed_web_bundle_signature_stack_entry.h"
@@ -48,7 +49,7 @@
return base::unexpected("The signature stack needs at least one entry.");
}
- if (base::ranges::all_of(entries, [](const auto& signature) {
+ if (std::ranges::all_of(entries, [](const auto& signature) {
return absl::holds_alternative<SignedWebBundleSignatureInfoUnknown>(
signature.signature_info());
})) {
diff --git a/components/web_package/test_support/signed_web_bundles/ecdsa_p256_key_pair.cc b/components/web_package/test_support/signed_web_bundles/ecdsa_p256_key_pair.cc
index 1b9ffd7..5ed6a16f 100644
--- a/components/web_package/test_support/signed_web_bundles/ecdsa_p256_key_pair.cc
+++ b/components/web_package/test_support/signed_web_bundles/ecdsa_p256_key_pair.cc
@@ -9,8 +9,9 @@
#include "components/web_package/test_support/signed_web_bundles/ecdsa_p256_key_pair.h"
+#include <algorithm>
+
#include "base/check_is_test.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "crypto/sha2.h"
#include "third_party/boringssl/src/include/openssl/ec_key.h"
@@ -53,7 +54,7 @@
bool produce_invalid_signature)
: public_key(*EcdsaP256PublicKey::Create(public_key_bytes)),
produce_invalid_signature(produce_invalid_signature) {
- base::ranges::copy(private_key_bytes, private_key.begin());
+ std::ranges::copy(private_key_bytes, private_key.begin());
}
EcdsaP256KeyPair::EcdsaP256KeyPair(const EcdsaP256KeyPair&) = default;
diff --git a/components/web_package/test_support/signed_web_bundles/ed25519_key_pair.cc b/components/web_package/test_support/signed_web_bundles/ed25519_key_pair.cc
index cce3c63..ed92c4a 100644
--- a/components/web_package/test_support/signed_web_bundles/ed25519_key_pair.cc
+++ b/components/web_package/test_support/signed_web_bundles/ed25519_key_pair.cc
@@ -4,7 +4,8 @@
#include "components/web_package/test_support/signed_web_bundles/ed25519_key_pair.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "third_party/boringssl/src/include/openssl/curve25519.h"
namespace web_package::test {
@@ -24,7 +25,7 @@
: public_key(Ed25519PublicKey::Create(public_key_bytes)),
produce_invalid_signature(produce_invalid_signature) {
std::array<uint8_t, ED25519_PRIVATE_KEY_LEN> private_key_array;
- base::ranges::copy(private_key_bytes, private_key_array.begin());
+ std::ranges::copy(private_key_bytes, private_key_array.begin());
private_key = std::move(private_key_array);
}
diff --git a/components/web_package/web_bundle_parser.cc b/components/web_package/web_bundle_parser.cc
index 4477d148..706831ee 100644
--- a/components/web_package/web_bundle_parser.cc
+++ b/components/web_package/web_bundle_parser.cc
@@ -4,6 +4,7 @@
#include "components/web_package/web_bundle_parser.h"
+#include <algorithm>
#include <memory>
#include <optional>
#include <string_view>
@@ -17,7 +18,6 @@
#include "base/not_fatal_until.h"
#include "base/notreached.h"
#include "base/numerics/checked_math.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -147,7 +147,7 @@
// If name contains any upper-case or non-ASCII characters, return an error.
// This matches the requirement in Section 8.1.2 of [RFC7540].
if (!base::IsStringASCII(name) ||
- base::ranges::any_of(name, base::IsAsciiUpper<char>)) {
+ std::ranges::any_of(name, base::IsAsciiUpper<char>)) {
return std::nullopt;
}
@@ -350,7 +350,7 @@
// Check the magic bytes "48 F0 9F 8C 90 F0 9F 93 A6".
const auto magic = input.ReadBytes(sizeof(kBundleMagicBytes));
- if (!magic || !base::ranges::equal(*magic, kBundleMagicBytes)) {
+ if (!magic || !std::ranges::equal(*magic, kBundleMagicBytes)) {
RunErrorCallback("Wrong magic bytes.");
return;
}
@@ -361,9 +361,9 @@
RunErrorCallback("Cannot read version bytes.");
return;
}
- if (!base::ranges::equal(*version, kVersionB2MagicBytes)) {
+ if (!std::ranges::equal(*version, kVersionB2MagicBytes)) {
const char* message;
- if (base::ranges::equal(*version, kVersionB1MagicBytes)) {
+ if (std::ranges::equal(*version, kVersionB1MagicBytes)) {
message =
"Bundle format version is 'b1' which is no longer supported."
" Currently supported version is: 'b2'";
@@ -834,7 +834,7 @@
int status;
const auto& status_str = pseudo_status->second;
if (status_str.size() != 3 ||
- !base::ranges::all_of(status_str, base::IsAsciiDigit<char>) ||
+ !std::ranges::all_of(status_str, base::IsAsciiDigit<char>) ||
!base::StringToInt(status_str, &status)) {
RunErrorCallback(":status must be 3 ASCII decimal digits.");
return;
diff --git a/components/web_package/web_bundle_parser_factory_unittest.cc b/components/web_package/web_bundle_parser_factory_unittest.cc
index 61135f3..6ddd64e0 100644
--- a/components/web_package/web_bundle_parser_factory_unittest.cc
+++ b/components/web_package/web_bundle_parser_factory_unittest.cc
@@ -4,6 +4,7 @@
#include "components/web_package/web_bundle_parser_factory.h"
+#include <algorithm>
#include <optional>
#include "base/files/file.h"
@@ -11,7 +12,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "base/test/task_environment.h"
#include "base/test/test_future.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -196,8 +196,8 @@
std::vector<GURL> requests;
requests.reserve(metadata->requests.size());
- base::ranges::transform(metadata->requests, std::back_inserter(requests),
- [](const auto& entry) { return entry.first; });
+ std::ranges::transform(metadata->requests, std::back_inserter(requests),
+ [](const auto& entry) { return entry.first; });
EXPECT_THAT(requests, UnorderedElementsAreArray(
{GURL("https://test.example.org/absolute-url"),
GURL("https://example.com/relative-url-1"),
diff --git a/components/web_package/web_bundle_parser_unittest.cc b/components/web_package/web_bundle_parser_unittest.cc
index dd66b89..6662f44 100644
--- a/components/web_package/web_bundle_parser_unittest.cc
+++ b/components/web_package/web_bundle_parser_unittest.cc
@@ -9,6 +9,7 @@
#include "components/web_package/web_bundle_parser.h"
+#include <algorithm>
#include <optional>
#include <string_view>
@@ -17,7 +18,6 @@
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/test/gmock_expected_support.h"
#include "base/test/task_environment.h"
#include "base/test/test_future.h"
@@ -717,7 +717,7 @@
TEST_F(WebBundleParserTest, RandomAccessContextLengthSmallerThanWebBundle) {
std::vector<uint8_t> bundle = CreateSmallBundle();
std::vector<uint8_t> invalid_length = {0, 0, 0, 0, 0, 0, 0, 10};
- base::ranges::copy(invalid_length, bundle.end() - 8);
+ std::ranges::copy(invalid_length, bundle.end() - 8);
TestDataSource data_source(bundle, /*is_random_access_context=*/true);
ExpectFormatError(ParseUnsignedBundle(&data_source));
@@ -733,7 +733,7 @@
TEST_F(WebBundleParserTest, RandomAccessContextLengthBiggerThanFile) {
std::vector<uint8_t> bundle = CreateSmallBundle();
std::vector<uint8_t> invalid_length = {0xff, 0, 0, 0, 0, 0, 0, 0};
- base::ranges::copy(invalid_length, bundle.end() - 8);
+ std::ranges::copy(invalid_length, bundle.end() - 8);
TestDataSource data_source(bundle, /*is_random_access_context=*/true);
ExpectFormatError(ParseUnsignedBundle(&data_source));
diff --git a/components/webauthn/core/browser/passkey_sync_bridge.cc b/components/webauthn/core/browser/passkey_sync_bridge.cc
index a7aaf76..3b5bdce5 100644
--- a/components/webauthn/core/browser/passkey_sync_bridge.cc
+++ b/components/webauthn/core/browser/passkey_sync_bridge.cc
@@ -17,7 +17,6 @@
#include "base/containers/span.h"
#include "base/functional/callback_helpers.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"
#include "components/sync/base/data_type.h"
@@ -113,7 +112,7 @@
std::optional<syncer::ModelError> PasskeySyncBridge::MergeFullSyncData(
std::unique_ptr<syncer::MetadataChangeList> metadata_changes,
syncer::EntityChangeList entity_changes) {
- CHECK(base::ranges::all_of(entity_changes, [](const auto& change) {
+ CHECK(std::ranges::all_of(entity_changes, [](const auto& change) {
return change->type() == syncer::EntityChange::ACTION_ADD;
}));
@@ -250,16 +249,16 @@
base::flat_set<std::string> PasskeySyncBridge::GetAllSyncIds() const {
std::vector<std::string> sync_ids;
- base::ranges::transform(data_, std::back_inserter(sync_ids),
- [](const auto& pair) { return pair.first; });
+ std::ranges::transform(data_, std::back_inserter(sync_ids),
+ [](const auto& pair) { return pair.first; });
return base::flat_set<std::string>(base::sorted_unique, std::move(sync_ids));
}
std::vector<sync_pb::WebauthnCredentialSpecifics>
PasskeySyncBridge::GetAllPasskeys() const {
std::vector<sync_pb::WebauthnCredentialSpecifics> passkeys;
- base::ranges::transform(data_, std::back_inserter(passkeys),
- [](const auto& pair) { return pair.second; });
+ std::ranges::transform(data_, std::back_inserter(passkeys),
+ [](const auto& pair) { return pair.second; });
return passkeys;
}
@@ -302,7 +301,7 @@
const base::Location& location) {
// Find the credential with the given |credential_id|.
const auto passkey_it =
- base::ranges::find_if(data_, [&credential_id](const auto& passkey) {
+ std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
return passkey.second.credential_id() == credential_id;
});
if (passkey_it == data_.end()) {
@@ -572,7 +571,7 @@
mutate_callback) {
// Find the credential with the given |credential_id|.
const auto passkey_it =
- base::ranges::find_if(data_, [&credential_id](const auto& passkey) {
+ std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
return passkey.second.credential_id() == credential_id;
});
if (passkey_it == data_.end()) {
diff --git a/components/webauthn/core/browser/test_passkey_model.cc b/components/webauthn/core/browser/test_passkey_model.cc
index 761b421c..a06307c2 100644
--- a/components/webauthn/core/browser/test_passkey_model.cc
+++ b/components/webauthn/core/browser/test_passkey_model.cc
@@ -4,12 +4,12 @@
#include "components/webauthn/core/browser/test_passkey_model.h"
+#include <algorithm>
#include <iterator>
#include <optional>
#include "base/notreached.h"
#include "base/rand_util.h"
-#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "components/sync/protocol/webauthn_credential_specifics.pb.h"
#include "components/webauthn/core/browser/passkey_model_change.h"
@@ -65,15 +65,15 @@
const std::string& rp_id,
const std::string& credential_id) const {
std::vector<sync_pb::WebauthnCredentialSpecifics> rp_passkeys;
- base::ranges::copy_if(
+ std::ranges::copy_if(
credentials_, std::back_inserter(rp_passkeys),
[&rp_id](const auto& passkey) { return passkey.rp_id() == rp_id; });
rp_passkeys = passkey_model_utils::FilterShadowedCredentials(rp_passkeys);
std::vector<sync_pb::WebauthnCredentialSpecifics> result;
- base::ranges::copy_if(rp_passkeys, std::back_inserter(result),
- [&credential_id](const auto& passkey) {
- return passkey.credential_id() == credential_id;
- });
+ std::ranges::copy_if(rp_passkeys, std::back_inserter(result),
+ [&credential_id](const auto& passkey) {
+ return passkey.credential_id() == credential_id;
+ });
if (result.empty()) {
return std::nullopt;
}
@@ -84,7 +84,7 @@
std::vector<sync_pb::WebauthnCredentialSpecifics>
TestPasskeyModel::GetPasskeysForRelyingPartyId(const std::string& rp_id) const {
std::vector<sync_pb::WebauthnCredentialSpecifics> passkeys;
- base::ranges::copy_if(
+ std::ranges::copy_if(
credentials_, std::back_inserter(passkeys),
[&rp_id](const auto& passkey) { return passkey.rp_id() == rp_id; });
return passkey_model_utils::FilterShadowedCredentials(passkeys);
@@ -134,8 +134,8 @@
// Don't implement the shadow chain deletion logic. Instead, remove the
// credential with the matching id.
const auto credential_it =
- base::ranges::find(credentials_, credential_id,
- &sync_pb::WebauthnCredentialSpecifics::credential_id);
+ std::ranges::find(credentials_, credential_id,
+ &sync_pb::WebauthnCredentialSpecifics::credential_id);
if (credential_it == credentials_.end()) {
return false;
}
@@ -154,8 +154,8 @@
PasskeyUpdate change,
bool updated_by_user) {
const auto credential_it =
- base::ranges::find(credentials_, credential_id,
- &sync_pb::WebauthnCredentialSpecifics::credential_id);
+ std::ranges::find(credentials_, credential_id,
+ &sync_pb::WebauthnCredentialSpecifics::credential_id);
if (credential_it == credentials_.end()) {
return false;
}
@@ -173,8 +173,8 @@
bool TestPasskeyModel::UpdatePasskeyTimestamp(const std::string& credential_id,
base::Time last_used_time) {
const auto credential_it =
- base::ranges::find(credentials_, credential_id,
- &sync_pb::WebauthnCredentialSpecifics::credential_id);
+ std::ranges::find(credentials_, credential_id,
+ &sync_pb::WebauthnCredentialSpecifics::credential_id);
if (credential_it == credentials_.end()) {
return false;
}
diff --git a/components/webauthn/json/value_conversions.cc b/components/webauthn/json/value_conversions.cc
index dfd2955..aee6b9a 100644
--- a/components/webauthn/json/value_conversions.cc
+++ b/components/webauthn/json/value_conversions.cc
@@ -6,13 +6,13 @@
#include <iterator>
#include <optional>
+#include <ranges>
#include <string_view>
#include "base/base64url.h"
#include "base/containers/span.h"
#include "base/containers/to_vector.h"
#include "base/feature_list.h"
-#include "base/ranges/ranges.h"
#include "base/values.h"
#include "device/fido/attestation_object.h"
#include "device/fido/authenticator_selection_criteria.h"
@@ -683,8 +683,8 @@
return InvalidMakeCredentialField("authenticatorData");
}
response->info->authenticator_data = ToByteVector(*opt_authenticator_data);
- if (!base::ranges::equal(response->info->authenticator_data,
- fields->authenticator_data)) {
+ if (!std::ranges::equal(response->info->authenticator_data,
+ fields->authenticator_data)) {
return InvalidMakeCredentialField("authenticatorData");
}
@@ -707,8 +707,7 @@
}
// For any key, providers must calculate the same key as us.
if (fields->public_key_der && opt_public_key &&
- !base::ranges::equal(*response->public_key_der,
- *fields->public_key_der)) {
+ !std::ranges::equal(*response->public_key_der, *fields->public_key_der)) {
return InvalidMakeCredentialField("publicKey");
}
diff --git a/components/webauthn/json/value_conversions_unittest.cc b/components/webauthn/json/value_conversions_unittest.cc
index 2e3d3f1b..040018726 100644
--- a/components/webauthn/json/value_conversions_unittest.cc
+++ b/components/webauthn/json/value_conversions_unittest.cc
@@ -526,11 +526,11 @@
expected->extensions->appid_extension);
EXPECT_EQ(response->extensions->echo_prf, expected->extensions->echo_prf);
ASSERT_TRUE(response->extensions->prf_results);
- EXPECT_TRUE(base::ranges::equal(response->extensions->prf_results->first,
- expected_prf_first));
+ EXPECT_TRUE(std::ranges::equal(response->extensions->prf_results->first,
+ expected_prf_first));
ASSERT_TRUE(response->extensions->prf_results->second);
- EXPECT_TRUE(base::ranges::equal(*response->extensions->prf_results->second,
- expected_prf_second));
+ EXPECT_TRUE(std::ranges::equal(*response->extensions->prf_results->second,
+ expected_prf_second));
EXPECT_EQ(response->extensions->prf_not_evaluated,
expected->extensions->prf_not_evaluated);
EXPECT_EQ(response->extensions->echo_large_blob,
diff --git a/components/webcrypto/algorithms/ecdh_unittest.cc b/components/webcrypto/algorithms/ecdh_unittest.cc
index 0a58459..bf9f3694 100644
--- a/components/webcrypto/algorithms/ecdh_unittest.cc
+++ b/components/webcrypto/algorithms/ecdh_unittest.cc
@@ -5,7 +5,8 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/webcrypto/algorithm_dispatch.h"
#include "components/webcrypto/algorithms/ec.h"
#include "components/webcrypto/algorithms/test_helpers.h"
@@ -114,7 +115,7 @@
// 528 bits.
KeyPair LoadTestKeys() {
base::Value::List tests = ReadJsonTestFileAsList("ecdh.json");
- const auto& test = base::ranges::find_if(tests, [](const base::Value& v) {
+ const auto& test = std::ranges::find_if(tests, [](const base::Value& v) {
return v.GetDict().FindBool("valid_p521_keys").has_value();
});
diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
index bf53561..13929e4f 100644
--- a/components/webrtc/media_stream_devices_controller.cc
+++ b/components/webrtc/media_stream_devices_controller.cc
@@ -4,12 +4,12 @@
#include "components/webrtc/media_stream_devices_controller.h"
+#include <algorithm>
#include <memory>
#include <utility>
#include <vector>
#include "base/functional/bind.h"
-#include "base/ranges/algorithm.h"
#include "build/build_config.h"
#include "components/permissions/permission_util.h"
#include "content/public/browser/browser_context.h"
@@ -449,7 +449,7 @@
}
std::vector<ContentSetting> responses;
- base::ranges::transform(
+ std::ranges::transform(
permissions_status, back_inserter(responses),
permissions::PermissionUtil::PermissionStatusToContentSetting);
diff --git a/components/zucchini/address_translator_unittest.cc b/components/zucchini/address_translator_unittest.cc
index a5d2ecd..6978264 100644
--- a/components/zucchini/address_translator_unittest.cc
+++ b/components/zucchini/address_translator_unittest.cc
@@ -4,11 +4,11 @@
#include "components/zucchini/address_translator.h"
+#include <algorithm>
#include <string>
#include <utility>
#include "base/format_macros.h"
-#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -54,11 +54,11 @@
auto first_non_blank = [](const std::string& t) {
auto is_blank = [](char ch) { return ch == '.'; };
- return base::ranges::find_if_not(t, is_blank) - t.begin();
+ return std::ranges::find_if_not(t, is_blank) - t.begin();
};
auto count_non_special = [](const std::string& t) {
auto is_special = [](char ch) { return ch == '.' || ch == '!'; };
- return t.size() - base::ranges::count_if(t, is_special);
+ return t.size() - std::ranges::count_if(t, is_special);
};
units.push_back({static_cast<offset_t>(first_non_blank(s1)),
static_cast<offset_t>(count_non_special(s1)),
diff --git a/components/zucchini/buffer_source.cc b/components/zucchini/buffer_source.cc
index c2e82c4..54bc81f 100644
--- a/components/zucchini/buffer_source.cc
+++ b/components/zucchini/buffer_source.cc
@@ -9,7 +9,8 @@
#include "components/zucchini/buffer_source.h"
-#include "base/ranges/algorithm.h"
+#include <algorithm>
+
#include "components/zucchini/algorithm.h"
namespace zucchini {
diff --git a/components/zucchini/buffer_view.h b/components/zucchini/buffer_view.h
index bbddef8..8b34744 100644
--- a/components/zucchini/buffer_view.h
+++ b/components/zucchini/buffer_view.h
@@ -14,10 +14,10 @@
#include <stdint.h>
#include <string.h>
+#include <algorithm>
#include <type_traits>
#include "base/check_op.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/algorithm.h"
namespace zucchini {
@@ -158,7 +158,7 @@
BufferRegion local_region() const { return BufferRegion{0, size()}; }
bool equals(BufferViewBase other) const {
- return base::ranges::equal(*this, other);
+ return std::ranges::equal(*this, other);
}
// Modifiers
diff --git a/components/zucchini/disassembler_elf_unittest.cc b/components/zucchini/disassembler_elf_unittest.cc
index e4c6764..8d4a5e3 100644
--- a/components/zucchini/disassembler_elf_unittest.cc
+++ b/components/zucchini/disassembler_elf_unittest.cc
@@ -7,11 +7,11 @@
#include <stddef.h>
#include <stdint.h>
+#include <algorithm>
#include <random>
#include <string>
#include <vector>
-#include "base/ranges/algorithm.h"
#include "components/zucchini/test_utils.h"
#include "components/zucchini/type_elf.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -148,7 +148,7 @@
elf::Elf32_Ehdr header = {};
auto e_ident =
ParseHexString("7F 45 4C 46 01 01 01 00 00 00 00 00 00 00 00 00");
- base::ranges::copy(e_ident, header.e_ident);
+ std::ranges::copy(e_ident, header.e_ident);
header.e_type = elf::ET_EXEC;
header.e_machine = elf::EM_386;
header.e_version = 1;
@@ -163,7 +163,7 @@
elf::Elf64_Ehdr header = {};
auto e_ident =
ParseHexString("7F 45 4C 46 02 01 01 00 00 00 00 00 00 00 00 00");
- base::ranges::copy(e_ident, header.e_ident);
+ std::ranges::copy(e_ident, header.e_ident);
header.e_type = elf::ET_EXEC;
header.e_machine = elf::EM_X86_64;
header.e_version = 1;
diff --git a/components/zucchini/ensemble_matcher.cc b/components/zucchini/ensemble_matcher.cc
index 0d64ed0..589c8ad5 100644
--- a/components/zucchini/ensemble_matcher.cc
+++ b/components/zucchini/ensemble_matcher.cc
@@ -4,11 +4,11 @@
#include "components/zucchini/ensemble_matcher.h"
+#include <algorithm>
#include <limits>
#include <vector>
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
namespace zucchini {
@@ -27,7 +27,7 @@
auto is_match_dex = [](const ElementMatch& match) {
return match.exe_type() == kExeTypeDex;
};
- auto num_dex = base::ranges::count_if(matches_, is_match_dex);
+ auto num_dex = std::ranges::count_if(matches_, is_match_dex);
if (num_dex > 1) {
LOG(WARNING) << "Found " << num_dex << " DEX: Ignoring all.";
std::erase_if(matches_, is_match_dex);
diff --git a/components/zucchini/equivalence_map.cc b/components/zucchini/equivalence_map.cc
index c98a5d3..ed39862f 100644
--- a/components/zucchini/equivalence_map.cc
+++ b/components/zucchini/equivalence_map.cc
@@ -4,6 +4,7 @@
#include "components/zucchini/equivalence_map.h"
+#include <algorithm>
#include <deque>
#include <tuple>
#include <utility>
@@ -11,7 +12,6 @@
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/encoded_view.h"
#include "components/zucchini/patch_reader.h"
#include "components/zucchini/suffix_array.h"
@@ -249,8 +249,8 @@
old_image_size_(old_image_size),
new_image_size_(new_image_size) {
DCHECK_GT(new_image_size_, 0U);
- base::ranges::transform(equivalence_map, equivalences_.begin(),
- &EquivalenceCandidate::eq);
+ std::ranges::transform(equivalence_map, equivalences_.begin(),
+ &EquivalenceCandidate::eq);
PruneEquivalencesAndSortBySource(&equivalences_);
}
diff --git a/components/zucchini/imposed_ensemble_matcher.cc b/components/zucchini/imposed_ensemble_matcher.cc
index f30e9b1..54dafe8a 100644
--- a/components/zucchini/imposed_ensemble_matcher.cc
+++ b/components/zucchini/imposed_ensemble_matcher.cc
@@ -4,12 +4,12 @@
#include "components/zucchini/imposed_ensemble_matcher.h"
+#include <algorithm>
#include <sstream>
#include <utility>
#include "base/functional/bind.h"
#include "base/logging.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/io_utils.h"
namespace zucchini {
@@ -67,7 +67,7 @@
});
// Check for overlaps in "new" file.
- if (base::ranges::adjacent_find(
+ if (std::ranges::adjacent_find(
matches_, [](const ElementMatch& match1, const ElementMatch& match2) {
return match1.new_element.hi() > match2.new_element.lo();
}) != matches_.end()) {
diff --git a/components/zucchini/integration_test.cc b/components/zucchini/integration_test.cc
index f9aec7f5..07d97dd 100644
--- a/components/zucchini/integration_test.cc
+++ b/components/zucchini/integration_test.cc
@@ -4,6 +4,7 @@
#include <stdint.h>
+#include <algorithm>
#include <optional>
#include <string>
#include <vector>
@@ -11,7 +12,6 @@
#include "base/files/file_path.h"
#include "base/files/memory_mapped_file.h"
#include "base/path_service.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/buffer_view.h"
#include "components/zucchini/patch_reader.h"
#include "components/zucchini/patch_writer.h"
@@ -77,7 +77,7 @@
patched_new_buffer.size()}));
// Note that |new_region| and |patched_new_buffer| are the same size.
- EXPECT_TRUE(base::ranges::equal(new_region, patched_new_buffer));
+ EXPECT_TRUE(std::ranges::equal(new_region, patched_new_buffer));
}
TEST(EndToEndTest, GenApplyRaw) {
diff --git a/components/zucchini/reloc_elf_unittest.cc b/components/zucchini/reloc_elf_unittest.cc
index 4f7ddea..1c3b618 100644
--- a/components/zucchini/reloc_elf_unittest.cc
+++ b/components/zucchini/reloc_elf_unittest.cc
@@ -6,12 +6,12 @@
#include <stdint.h>
+#include <algorithm>
#include <memory>
#include <utility>
#include <vector>
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/address_translator.h"
#include "components/zucchini/algorithm.h"
#include "components/zucchini/disassembler_elf.h"
@@ -67,8 +67,8 @@
// Set up test image with reloc sections.
for (const RelocSpec& reloc_spec : reloc_specs) {
BufferRegion reloc_region = {reloc_spec.start, reloc_spec.data.size()};
- base::ranges::copy(reloc_spec.data,
- image_data_.begin() + reloc_region.lo());
+ std::ranges::copy(reloc_spec.data,
+ image_data_.begin() + reloc_region.lo());
section_dimensions_.emplace_back(
MakeSectionDimensions<typename ElfIntelTraits::Elf_Shdr>(
reloc_region, ElfIntelTraits::kVAWidth));
diff --git a/components/zucchini/reloc_win32_unittest.cc b/components/zucchini/reloc_win32_unittest.cc
index 72afe8f..ccc2ecce 100644
--- a/components/zucchini/reloc_win32_unittest.cc
+++ b/components/zucchini/reloc_win32_unittest.cc
@@ -6,13 +6,13 @@
#include <stdint.h>
+#include <algorithm>
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "base/test/gtest_util.h"
#include "components/zucchini/address_translator.h"
#include "components/zucchini/algorithm.h"
@@ -191,7 +191,7 @@
"00 10 04 00 10 00 00 00 C0 32 18 A3 F8 A7 FF 0F "
"00 20 04 00 10 00 00 00 80 A0 65 31 F8 37 BC 3A");
reloc_region_ = {0x600, reloc_data.size()};
- base::ranges::copy(reloc_data, image_data.begin() + reloc_region_.lo());
+ std::ranges::copy(reloc_data, image_data.begin() + reloc_region_.lo());
image_ = {image_data.data(), image_data.size()};
offset_t image_size = base::checked_cast<offset_t>(image_.size());
diff --git a/components/zucchini/target_pool.cc b/components/zucchini/target_pool.cc
index f88b6f1e..94cc0303 100644
--- a/components/zucchini/target_pool.cc
+++ b/components/zucchini/target_pool.cc
@@ -4,11 +4,11 @@
#include "components/zucchini/target_pool.h"
+#include <algorithm>
#include <iterator>
#include <utility>
#include "base/check.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/algorithm.h"
#include "components/zucchini/equivalence_map.h"
@@ -27,7 +27,7 @@
TargetPool::~TargetPool() = default;
void TargetPool::InsertTargets(const std::vector<offset_t>& targets) {
- base::ranges::copy(targets, std::back_inserter(targets_));
+ std::ranges::copy(targets, std::back_inserter(targets_));
SortAndUniquify(&targets_);
}
@@ -46,8 +46,8 @@
void TargetPool::InsertTargets(const std::vector<Reference>& references) {
// This can be called many times, so it's better to let std::back_inserter()
// manage |targets_| resize, instead of manually reserving space.
- base::ranges::transform(references, std::back_inserter(targets_),
- &Reference::target);
+ std::ranges::transform(references, std::back_inserter(targets_),
+ &Reference::target);
SortAndUniquify(&targets_);
}
diff --git a/components/zucchini/zucchini_apply.cc b/components/zucchini/zucchini_apply.cc
index b95a8bc..d40d38f 100644
--- a/components/zucchini/zucchini_apply.cc
+++ b/components/zucchini/zucchini_apply.cc
@@ -16,7 +16,6 @@
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
-#include "base/ranges/algorithm.h"
#include "components/zucchini/disassembler.h"
#include "components/zucchini/element_detection.h"
#include "components/zucchini/equivalence_map.h"
@@ -57,7 +56,7 @@
LOG(ERROR) << "Error reading extra_data";
return false;
}
- base::ranges::copy(*extra_data, dst_it);
+ std::ranges::copy(*extra_data, dst_it);
if (!equiv_source.Done() || !extra_data_source.Done()) {
LOG(ERROR) << "Found trailing equivalence and extra_data";
return false;
