[go: nahoru, domu]

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/attribution_reporting/aggregatable_trigger_config_unittest.cc b/components/attribution_reporting/aggregatable_trigger_config_unittest.cc
index 6d82e483..7ed8776f 100644
--- a/components/attribution_reporting/aggregatable_trigger_config_unittest.cc
+++ b/components/attribution_reporting/aggregatable_trigger_config_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "components/attribution_reporting/aggregatable_trigger_config.h"
 
+#include <optional>
 #include <string>
 
 #include "base/test/gmock_expected_support.h"
@@ -16,7 +17,6 @@
 #include "components/attribution_reporting/trigger_registration_error.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace attribution_reporting {
 namespace {
@@ -124,7 +124,7 @@
                       kTriggerContextIdInvalidSourceRegistrationTimeConfig),
           ValueIs(*AggregatableTriggerConfig::Create(
               SourceRegistrationTimeConfig::kInclude,
-              /*trigger_context_id=*/absl::nullopt)),
+              /*trigger_context_id=*/std::nullopt)),
       },
   };
 
@@ -160,8 +160,8 @@
   const struct {
     const char* desc;
     SourceRegistrationTimeConfig source_registration_time_config;
-    absl::optional<std::string> trigger_context_id;
-    absl::optional<AggregatableTriggerConfig> expected;
+    std::optional<std::string> trigger_context_id;
+    std::optional<AggregatableTriggerConfig> expected;
   } kTestCases[] = {
       {
           "valid_exclude_source_registration_time_with_trigger_context_id",
@@ -173,33 +173,33 @@
       {
           "valid_exclude_source_registration_time_without_trigger_context_id",
           SourceRegistrationTimeConfig::kExclude,
-          absl::nullopt,
+          std::nullopt,
           AggregatableTriggerConfig(),
       },
       {
           "valid_include_source_registration_time_without_trigger_context_id",
           SourceRegistrationTimeConfig::kInclude,
-          absl::nullopt,
+          std::nullopt,
           *AggregatableTriggerConfig::Create(
-              SourceRegistrationTimeConfig::kInclude, absl::nullopt),
+              SourceRegistrationTimeConfig::kInclude, std::nullopt),
       },
       {
           "trigger_context_id_empty",
           SourceRegistrationTimeConfig::kExclude,
           "",
-          absl::nullopt,
+          std::nullopt,
       },
       {
           "trigger_context_id_too_long",
           SourceRegistrationTimeConfig::kExclude,
           std::string(65, 'a'),
-          absl::nullopt,
+          std::nullopt,
       },
       {
           "trigger_context_id_disallowed",
           SourceRegistrationTimeConfig::kInclude,
           "123",
-          absl::nullopt,
+          std::nullopt,
       },
   };
 
@@ -244,7 +244,7 @@
       {
           *AggregatableTriggerConfig::Create(
               SourceRegistrationTimeConfig::kInclude,
-              /*trigger_context_id=*/absl::nullopt),
+              /*trigger_context_id=*/std::nullopt),
           R"json({
             "aggregatable_source_registration_time":"include"
           })json",