Rename {absl => std}::optional in //components/
#cleanup
Automated patch. This is a no-op. Please avoid, to assign unrelated
bugs to this, as much as possible.
Context:
https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email
As of https://crrev.com/1204351, absl::optional is now a type alias
for std::optional. We should migrate toward it.
Script:
```
function replace {
echo "Replacing $1 by $2"
git grep -l "$1" \
| cut -f1 -d: \
| grep \
-e "^components/" \
| grep \
-e "\.h" \
-e "\.cc" \
-e "\.mm" \
| grep -v \
-e "components/cast_streaming/browser/public/receiver_config.*" \
-e "components/power_metrics/*" \
-e "components/zucchini/patch_reader.*" \
| sort \
| uniq \
| xargs sed -i "s/$1/$2/g"
}
replace "absl::make_optional" "std::make_optional"
replace "absl::optional" "std::optional"
replace "absl::nullopt" "std::nullopt"
replace "absl::in_place" "std::in_place"
replace "absl::in_place_t" "std::in_place_t"
replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>"
echo "Formatting:"
echo "IncludeBlocks: Regroup" >> ".clang-format"
echo "IncludeIsMainRegex: \"(_(android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?(_(unit|browser|perf)?tests?)?$\"" >> ".clang-format"
git cl format
git restore ".clang-format"
git cl format
```
Bug: chromium:1500249
Change-Id: I34b45aba082a627d94fd9d3f9f994a60c64b40b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5200092
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1252820}
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 76860f0e..f3dbbfd 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -1053,11 +1053,11 @@
: GURL();
}
-absl::optional<TemplateURLService::SearchMetadata>
+std::optional<TemplateURLService::SearchMetadata>
TemplateURLService::ExtractSearchMetadata(const GURL& url) const {
const TemplateURL* template_url = GetTemplateURLForHost(url.host());
if (!template_url) {
- return absl::nullopt;
+ return std::nullopt;
}
GURL normalized_url;
@@ -1070,7 +1070,7 @@
/*normalize_search_terms=*/true, &normalized_url,
&normalized_search_terms);
if (!is_valid_search_url) {
- return absl::nullopt;
+ return std::nullopt;
}
return SearchMetadata{template_url, normalized_url, normalized_search_terms};
@@ -1417,7 +1417,7 @@
return current_data;
}
-absl::optional<syncer::ModelError> TemplateURLService::ProcessSyncChanges(
+std::optional<syncer::ModelError> TemplateURLService::ProcessSyncChanges(
const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
if (!models_associated_) {
@@ -1436,7 +1436,7 @@
&dsp_change_origin_, DSP_CHANGE_SYNC_UNINTENTIONAL);
syncer::SyncChangeList new_changes;
- absl::optional<syncer::ModelError> error;
+ std::optional<syncer::ModelError> error;
for (auto iter = change_list.begin(); iter != change_list.end(); ++iter) {
DCHECK_EQ(syncer::SEARCH_ENGINES, iter->sync_data().GetDataType());
@@ -1522,7 +1522,7 @@
return weak_ptr_factory_.GetWeakPtr();
}
-absl::optional<syncer::ModelError> TemplateURLService::MergeDataAndStartSyncing(
+std::optional<syncer::ModelError> TemplateURLService::MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
std::unique_ptr<syncer::SyncChangeProcessor> sync_processor) {
@@ -1628,7 +1628,7 @@
PruneSyncChanges(&sync_data_map, &new_changes);
LogDuplicatesHistogram(GetTemplateURLs());
- absl::optional<syncer::ModelError> error =
+ std::optional<syncer::ModelError> error =
sync_processor_->ProcessSyncChanges(FROM_HERE, new_changes);
if (!error.has_value()) {
// The ACTION_DELETEs from this set are processed. Empty it so we don't try
