[go: nahoru, domu]

Rename {absl => std}::optional in //ash/

Automated patch, intended to be effectively a no-op.

Context:
https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email&utm_source=footer

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 "^ash" \
    | sort \
    | uniq \
    | grep \
      -e "\.h" \
      -e "\.cc" \
      -e "\.mm" \
      -e "\.py" \
    | 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>"
git cl format
```

Bug: chromium:1500249
AX-Relnotes: n/a.
Change-Id: I7087c89bc345e825ebcb8c66325f4dcc9d72c3b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5062951
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1230002}
diff --git a/ash/login/login_screen_controller.cc b/ash/login/login_screen_controller.cc
index 845fdb6..1e01577 100644
--- a/ash/login/login_screen_controller.cc
+++ b/ash/login/login_screen_controller.cc
@@ -109,7 +109,7 @@
       << static_cast<int>(authentication_stage_);
 
   if (!client_) {
-    std::move(callback).Run(absl::nullopt);
+    std::move(callback).Run(std::nullopt);
     return;
   }
 
@@ -166,7 +166,7 @@
       << static_cast<int>(authentication_stage_);
 
   if (!client_) {
-    std::move(callback).Run(/*success=*/absl::nullopt);
+    std::move(callback).Run(/*success=*/std::nullopt);
     return;
   }
 
@@ -488,7 +488,7 @@
     bool success) {
   LOG(WARNING) << "crbug.com/1339004 : authentication complete";
   SetAuthenticationStage(AuthenticationStage::kUserCallback);
-  std::move(callback).Run(absl::make_optional<bool>(success));
+  std::move(callback).Run(std::make_optional<bool>(success));
   LOG(WARNING) << "crbug.com/1339004 : triggered callback";
   SetAuthenticationStage(AuthenticationStage::kIdle);