Replace rtc::Optional with absl::optional in test and rtc_tools

This is a no-op change because rtc::Optional is an alias to absl::optional

This CL generated by running script with parameters 'test rtc_tools'

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: Ibb43c737f4c45fe300736382b0dd2d8ab32c6377
Reviewed-on: https://webrtc-review.googlesource.com/83944
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23642}
This commit is contained in:
Danil Chapovalov
2018-06-18 12:54:17 +02:00
committed by Commit Bot
parent 9bf31584d1
commit 431abd989b
25 changed files with 116 additions and 116 deletions

View File

@ -41,13 +41,13 @@ if (rtc_enable_protobuf) {
deps = [
":network_tester_config_proto",
":network_tester_packet_proto",
"../../api:optional",
"../../p2p",
"../../rtc_base:checks",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"//third_party/abseil-cpp/absl/types:optional",
]
if (!build_with_chromium && is_clang) {

View File

@ -31,10 +31,10 @@ ConfigReader::ConfigReader(const std::string& config_file_path)
ConfigReader::~ConfigReader() = default;
rtc::Optional<ConfigReader::Config> ConfigReader::GetNextConfig() {
absl::optional<ConfigReader::Config> ConfigReader::GetNextConfig() {
#ifdef WEBRTC_NETWORK_TESTER_PROTO
if (proto_config_index_ >= proto_all_configs_.configs_size())
return rtc::nullopt;
return absl::nullopt;
auto proto_config = proto_all_configs_.configs(proto_config_index_++);
RTC_DCHECK(proto_config.has_packet_send_interval_ms());
RTC_DCHECK(proto_config.has_packet_size());
@ -45,7 +45,7 @@ rtc::Optional<ConfigReader::Config> ConfigReader::GetNextConfig() {
config.execution_time_ms = proto_config.execution_time_ms();
return config;
#else
return rtc::nullopt;
return absl::nullopt;
#endif // WEBRTC_NETWORK_TESTER_PROTO
}

View File

@ -14,7 +14,7 @@
#include <fstream>
#include <string>
#include "api/optional.h"
#include "absl/types/optional.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/ignore_wundef.h"
@ -40,7 +40,7 @@ class ConfigReader {
explicit ConfigReader(const std::string& config_file_path);
~ConfigReader();
rtc::Optional<Config> GetNextConfig();
absl::optional<Config> GetNextConfig();
private:
NetworkTesterAllConfigs proto_all_configs_;

View File

@ -37,7 +37,7 @@ void TestController::SendConnectTo(const std::string& hostname, int port) {
udp_transport_->SetRemoteAddress(rtc::SocketAddress(hostname, port));
NetworkTesterPacket packet;
packet.set_type(NetworkTesterPacket::HAND_SHAKING);
SendData(packet, rtc::nullopt);
SendData(packet, absl::nullopt);
rtc::CritScope scoped_lock(&local_test_done_lock_);
local_test_done_ = false;
remote_test_done_ = false;
@ -49,7 +49,7 @@ void TestController::Run() {
}
void TestController::SendData(const NetworkTesterPacket& packet,
rtc::Optional<size_t> data_size) {
absl::optional<size_t> data_size) {
// Can be call from packet_sender or from test_controller thread.
size_t packet_size = packet.ByteSizeLong();
send_data_[0] = packet_size;
@ -65,7 +65,7 @@ void TestController::OnTestDone() {
RTC_DCHECK_CALLED_SEQUENTIALLY(&packet_sender_checker_);
NetworkTesterPacket packet;
packet.set_type(NetworkTesterPacket::TEST_DONE);
SendData(packet, rtc::nullopt);
SendData(packet, absl::nullopt);
rtc::CritScope scoped_lock(&local_test_done_lock_);
local_test_done_ = true;
}
@ -92,7 +92,7 @@ void TestController::OnReadPacket(rtc::AsyncPacketSocket* socket,
NetworkTesterPacket packet;
packet.set_type(NetworkTesterPacket::TEST_START);
udp_transport_->SetRemoteAddress(remote_addr);
SendData(packet, rtc::nullopt);
SendData(packet, absl::nullopt);
packet_sender_.reset(new PacketSender(this, config_file_path_));
packet_sender_->StartSending();
rtc::CritScope scoped_lock(&local_test_done_lock_);

View File

@ -49,7 +49,7 @@ class TestController : public sigslot::has_slots<> {
void SendConnectTo(const std::string& hostname, int port);
void SendData(const NetworkTesterPacket& packet,
rtc::Optional<size_t> data_size);
absl::optional<size_t> data_size);
void OnTestDone();