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/metrics/demographics/demographic_metrics_provider.cc b/components/metrics/demographics/demographic_metrics_provider.cc
index ec05167..7dd42b16 100644
--- a/components/metrics/demographics/demographic_metrics_provider.cc
+++ b/components/metrics/demographics/demographic_metrics_provider.cc
@@ -6,9 +6,9 @@
#include "base/feature_list.h"
#include "base/metrics/histogram_functions.h"
-#include "base/optional.h"
#include "build/chromeos_buildflags.h"
#include "components/sync/driver/sync_service_utils.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/metrics_proto/ukm/report.pb.h"
namespace metrics {
@@ -51,11 +51,11 @@
DemographicMetricsProvider::~DemographicMetricsProvider() {}
-base::Optional<UserDemographics>
+absl::optional<UserDemographics>
DemographicMetricsProvider::ProvideSyncedUserNoisedBirthYearAndGender() {
// Skip if feature disabled.
if (!base::FeatureList::IsEnabled(kDemographicMetricsReporting))
- return base::nullopt;
+ return absl::nullopt;
#if !BUILDFLAG(IS_CHROMEOS_ASH)
// Skip if not exactly one Profile on disk. Having more than one Profile that
@@ -71,7 +71,7 @@
if (profile_client_->GetNumberOfProfilesOnDisk() != 1) {
LogUserDemographicsStatusInHistogram(
UserDemographicsStatus::kMoreThanOneProfile);
- return base::nullopt;
+ return absl::nullopt;
}
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -80,13 +80,13 @@
if (!sync_service) {
LogUserDemographicsStatusInHistogram(
UserDemographicsStatus::kNoSyncService);
- return base::nullopt;
+ return absl::nullopt;
}
if (!CanUploadDemographicsToGoogle(sync_service)) {
LogUserDemographicsStatusInHistogram(
UserDemographicsStatus::kSyncNotEnabled);
- return base::nullopt;
+ return absl::nullopt;
}
UserDemographicsResult demographics_result =
@@ -97,7 +97,7 @@
if (demographics_result.IsSuccess())
return demographics_result.value();
- return base::nullopt;
+ return absl::nullopt;
}
void DemographicMetricsProvider::ProvideCurrentSessionData(
