Replace rtc::Optional with absl::optional in rtc_base
This is a no-op change because rtc::Optional is an alias to absl::optional
This CL generated by running script with parameter 'rtc_base'
Then manually fix where Optional was used without rtc prefix (patchset#3)
find $@ -type f \( -name \*.h -o -name \*.cc \) \
-exec sed -i 's|rtc::Optional|absl::optional|g' {} \+ \
-exec sed -i 's|rtc::nullopt|absl::nullopt|g' {} \+ \
-exec sed -i 's|#include "api/optional.h"|#include "absl/types/optional.h"|' {} \+
find $@ -type f -name BUILD.gn \
-exec sed -r -i 's|"[\./api]*:optional"|"//third_party/abseil-cpp/absl/types:optional"|' {} \+;
git cl format
Bug: webrtc:9078
Change-Id: I825f80cc8089747876ba6316d9e7c30e05716974
Reviewed-on: https://webrtc-review.googlesource.com/84585
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23700}
diff --git a/rtc_base/numerics/sample_counter_unittest.cc b/rtc_base/numerics/sample_counter_unittest.cc
index 844ea4a..898f00c 100644
--- a/rtc_base/numerics/sample_counter_unittest.cc
+++ b/rtc_base/numerics/sample_counter_unittest.cc
@@ -23,9 +23,9 @@
TEST(SampleCounterTest, ProcessesNoSamples) {
constexpr int kMinSamples = 1;
SampleCounter counter;
- EXPECT_THAT(counter.Avg(kMinSamples), Eq(rtc::nullopt));
- EXPECT_THAT(counter.Avg(kMinSamples), Eq(rtc::nullopt));
- EXPECT_THAT(counter.Max(), Eq(rtc::nullopt));
+ EXPECT_THAT(counter.Avg(kMinSamples), Eq(absl::nullopt));
+ EXPECT_THAT(counter.Avg(kMinSamples), Eq(absl::nullopt));
+ EXPECT_THAT(counter.Max(), Eq(absl::nullopt));
}
TEST(SampleCounterTest, NotEnoughSamples) {
@@ -34,8 +34,8 @@
for (int value : {1, 2, 3, 4, 5}) {
counter.Add(value);
}
- EXPECT_THAT(counter.Avg(kMinSamples), Eq(rtc::nullopt));
- EXPECT_THAT(counter.Avg(kMinSamples), Eq(rtc::nullopt));
+ EXPECT_THAT(counter.Avg(kMinSamples), Eq(absl::nullopt));
+ EXPECT_THAT(counter.Avg(kMinSamples), Eq(absl::nullopt));
EXPECT_THAT(counter.Max(), Eq(5));
}