diff options
author | Anton Bikineev <bikineev@chromium.org> | 2021-05-15 22:35:36 +0000 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 21:14:18 -0700 |
commit | 1a96551a279242efef41468357e38d3091e884bc (patch) | |
tree | 04fb6730d8927a839d99d24492555b877077317d /imposed_ensemble_matcher_unittest.cc | |
parent | 147f86be24a5ceb5447a9376fdc8c65044bb2977 (diff) | |
download | zucchini-1a96551a279242efef41468357e38d3091e884bc.tar.gz |
components: Replace base::Optional and friends with absl counterparts
This replaces:
- base::Optional -> absl::optional
- include "base/optional.h"
->
include "third_party/abseil-cpp/absl/types/optional.h"
- base::nullopt -> absl::nullopt
- base::make_optional -> absl::make_optional
Bug: 1202909
Change-Id: If697b7bf69b199c1796f873eedca3359cdb48c64
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2897151
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Owners-Override: Anton Bikineev <bikineev@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#883296}
NOKEYCHECK=True
GitOrigin-RevId: 1156b5f891de178171e71b9221a96bef1ced3d3b
Diffstat (limited to 'imposed_ensemble_matcher_unittest.cc')
-rw-r--r-- | imposed_ensemble_matcher_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/imposed_ensemble_matcher_unittest.cc b/imposed_ensemble_matcher_unittest.cc index 85f1016..9a6dc7d 100644 --- a/imposed_ensemble_matcher_unittest.cc +++ b/imposed_ensemble_matcher_unittest.cc @@ -14,12 +14,12 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/check_op.h" -#include "base/optional.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/disassembler.h" #include "components/zucchini/element_detection.h" #include "components/zucchini/image_utils.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace zucchini { @@ -36,14 +36,14 @@ class TestElementDetector { public: TestElementDetector() {} - base::Optional<Element> Run(ConstBufferView image) const { + absl::optional<Element> Run(ConstBufferView image) const { DCHECK_GT(image.size(), 0U); char first_char = *image.begin(); if (first_char == 'W' || first_char == 'w') return Element(image.local_region(), kExeTypeWin32X86); if (first_char == 'E' || first_char == 'e') return Element(image.local_region(), kExeTypeElfX86); - return base::nullopt; + return absl::nullopt; } }; |