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 <[email protected]>
Owners-Override: Anton Bikineev <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/master@{#883296}
diff --git a/components/update_client/protocol_serializer.cc b/components/update_client/protocol_serializer.cc
index f88de4e..d649a14 100644
--- a/components/update_client/protocol_serializer.cc
+++ b/components/update_client/protocol_serializer.cc
@@ -130,7 +130,7 @@
request.os.arch = base::SysInfo().OperatingSystemArchitecture();
if (updater_state_attributes) {
- request.updater = base::make_optional<protocol_request::Updater>();
+ request.updater = absl::make_optional<protocol_request::Updater>();
auto it = updater_state_attributes->find("name");
if (it != updater_state_attributes->end())
request.updater->name = it->second;
@@ -174,7 +174,7 @@
protocol_request::App MakeProtocolApp(
const std::string& app_id,
const base::Version& version,
- base::Optional<std::vector<base::Value>> events) {
+ absl::optional<std::vector<base::Value>> events) {
protocol_request::App app;
app.app_id = app_id;
app.version = version.GetString();
@@ -195,9 +195,9 @@
const std::string& cohort_name,
const std::string& release_channel,
const std::vector<int>& disabled_reasons,
- base::Optional<protocol_request::UpdateCheck> update_check,
- base::Optional<protocol_request::Ping> ping) {
- auto app = MakeProtocolApp(app_id, version, base::nullopt);
+ absl::optional<protocol_request::UpdateCheck> update_check,
+ absl::optional<protocol_request::Ping> ping) {
+ auto app = MakeProtocolApp(app_id, version, absl::nullopt);
app.brand_code = brand_code;
app.install_source = install_source;
app.install_location = install_location;
