[Extensions] Remove ExtensionSyncData::OptionalBoolean
ExtensionSyncData::OptionalBoolean was added before base::Optional<>
existed. Now that we have base::Optional<>, we should just use that.
Bug: None
Change-Id: Ibf19830b6d7154be82f6a45f9b645b3055d2da3b
Reviewed-on: https://chromium-review.googlesource.com/1044646
Reviewed-by: Karan Bhatia <[email protected]>
Commit-Queue: Devlin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#556199}diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc
index 7a1b924d..f6b4ed0 100644
--- a/chrome/browser/extensions/extension_sync_data.cc
+++ b/chrome/browser/extensions/extension_sync_data.cc
@@ -79,7 +79,6 @@
disable_reasons_(disable_reason::DISABLE_NONE),
incognito_enabled_(false),
remote_install_(false),
- all_urls_enabled_(BOOLEAN_UNSET),
installed_by_custodian_(false),
launch_type_(LAUNCH_TYPE_INVALID) {}
@@ -88,20 +87,25 @@
int disable_reasons,
bool incognito_enabled,
bool remote_install,
- OptionalBoolean all_urls_enabled,
+ base::Optional<bool> all_urls_enabled,
bool installed_by_custodian)
- : ExtensionSyncData(extension, enabled, disable_reasons, incognito_enabled,
- remote_install, all_urls_enabled,
- installed_by_custodian, StringOrdinal(),
- StringOrdinal(), LAUNCH_TYPE_INVALID) {
-}
+ : ExtensionSyncData(extension,
+ enabled,
+ disable_reasons,
+ incognito_enabled,
+ remote_install,
+ all_urls_enabled,
+ installed_by_custodian,
+ StringOrdinal(),
+ StringOrdinal(),
+ LAUNCH_TYPE_INVALID) {}
ExtensionSyncData::ExtensionSyncData(const Extension& extension,
bool enabled,
int disable_reasons,
bool incognito_enabled,
bool remote_install,
- OptionalBoolean all_urls_enabled,
+ base::Optional<bool> all_urls_enabled,
bool installed_by_custodian,
const StringOrdinal& app_launch_ordinal,
const StringOrdinal& page_ordinal,
@@ -192,8 +196,8 @@
specifics->set_disable_reasons(disable_reasons_);
specifics->set_incognito_enabled(incognito_enabled_);
specifics->set_remote_install(remote_install_);
- if (all_urls_enabled_ != BOOLEAN_UNSET)
- specifics->set_all_urls_enabled(all_urls_enabled_ == BOOLEAN_TRUE);
+ if (all_urls_enabled_.has_value())
+ specifics->set_all_urls_enabled(*all_urls_enabled_);
specifics->set_installed_by_custodian(installed_by_custodian_);
specifics->set_name(name_);
}
@@ -275,12 +279,11 @@
disable_reasons_ = specifics.disable_reasons();
incognito_enabled_ = specifics.incognito_enabled();
if (specifics.has_all_urls_enabled()) {
- all_urls_enabled_ =
- specifics.all_urls_enabled() ? BOOLEAN_TRUE : BOOLEAN_FALSE;
+ all_urls_enabled_ = specifics.all_urls_enabled();
} else {
// Set this explicitly (even though it's the default) on the offchance
// that someone is re-using an ExtensionSyncData object.
- all_urls_enabled_ = BOOLEAN_UNSET;
+ all_urls_enabled_ = base::nullopt;
}
remote_install_ = specifics.remote_install();
installed_by_custodian_ = specifics.installed_by_custodian();
