Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1271)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 43ca4bfacebd68bde9cb91efff28fd25fa242afc..05e89be215b07c2fe4a344baf415347e4cc2d039 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -47,8 +47,7 @@ std::unique_ptr<base::Value> DecodeIntegerValue(google::protobuf::int64 value) {
return std::unique_ptr<base::Value>();
}
- return std::unique_ptr<base::Value>(
- new base::FundamentalValue(static_cast<int>(value)));
+ return std::unique_ptr<base::Value>(new base::Value(static_cast<int>(value)));
}
// Decodes a JSON string to a base::Value, and drops unknown properties
@@ -116,44 +115,42 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.has_guest_mode_enabled()) {
const em::GuestModeEnabledProto& container(policy.guest_mode_enabled());
if (container.has_guest_mode_enabled()) {
- policies->Set(key::kDeviceGuestModeEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.guest_mode_enabled()),
- nullptr);
+ policies->Set(
+ key::kDeviceGuestModeEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.guest_mode_enabled()),
+ nullptr);
}
}
if (policy.has_reboot_on_shutdown()) {
const em::RebootOnShutdownProto& container(policy.reboot_on_shutdown());
if (container.has_reboot_on_shutdown()) {
- policies->Set(key::kDeviceRebootOnShutdown, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.reboot_on_shutdown()),
- nullptr);
+ policies->Set(
+ key::kDeviceRebootOnShutdown, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.reboot_on_shutdown()),
+ nullptr);
}
}
if (policy.has_show_user_names()) {
const em::ShowUserNamesOnSigninProto& container(policy.show_user_names());
if (container.has_show_user_names()) {
- policies->Set(
- key::kDeviceShowUserNamesOnSignin, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.show_user_names()),
- nullptr);
+ policies->Set(key::kDeviceShowUserNamesOnSignin, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.show_user_names()),
+ nullptr);
}
}
if (policy.has_allow_new_users()) {
const em::AllowNewUsersProto& container(policy.allow_new_users());
if (container.has_allow_new_users()) {
- policies->Set(
- key::kDeviceAllowNewUsers, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.allow_new_users()),
- nullptr);
+ policies->Set(key::kDeviceAllowNewUsers, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.allow_new_users()),
+ nullptr);
}
}
@@ -171,11 +168,11 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
const em::EphemeralUsersEnabledProto& container(
policy.ephemeral_users_enabled());
if (container.has_ephemeral_users_enabled()) {
- policies->Set(key::kDeviceEphemeralUsersEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.ephemeral_users_enabled()),
- nullptr);
+ policies->Set(
+ key::kDeviceEphemeralUsersEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.ephemeral_users_enabled()),
+ nullptr);
}
}
@@ -254,18 +251,17 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
DecodeIntegerValue(container.auto_login_delay()), nullptr);
}
if (container.has_enable_auto_login_bailout()) {
- policies->Set(key::kDeviceLocalAccountAutoLoginBailoutEnabled,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.enable_auto_login_bailout()),
- nullptr);
+ policies->Set(
+ key::kDeviceLocalAccountAutoLoginBailoutEnabled,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.enable_auto_login_bailout()),
+ nullptr);
}
if (container.has_prompt_for_network_when_offline()) {
policies->Set(key::kDeviceLocalAccountPromptForNetworkWhenOffline,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
container.prompt_for_network_when_offline()),
nullptr);
}
@@ -275,22 +271,22 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
const em::SupervisedUsersSettingsProto& container =
policy.supervised_users_settings();
if (container.has_supervised_users_enabled()) {
- policies->Set(key::kSupervisedUsersEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.supervised_users_enabled()),
- nullptr);
+ policies->Set(
+ key::kSupervisedUsersEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.supervised_users_enabled()),
+ nullptr);
}
}
if (policy.has_saml_settings()) {
const em::SAMLSettingsProto& container(policy.saml_settings());
if (container.has_transfer_saml_cookies()) {
- policies->Set(key::kDeviceTransferSAMLCookies, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.transfer_saml_cookies()),
- nullptr);
+ policies->Set(
+ key::kDeviceTransferSAMLCookies, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.transfer_saml_cookies()),
+ nullptr);
}
}
@@ -309,11 +305,10 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.has_allow_bluetooth()) {
const em::AllowBluetoothProto& container(policy.allow_bluetooth());
if (container.has_allow_bluetooth()) {
- policies->Set(
- key::kDeviceAllowBluetooth, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.allow_bluetooth()),
- nullptr);
+ policies->Set(key::kDeviceAllowBluetooth, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.allow_bluetooth()),
+ nullptr);
}
}
@@ -396,11 +391,11 @@ void DecodeNetworkPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.has_data_roaming_enabled()) {
const em::DataRoamingEnabledProto& container(policy.data_roaming_enabled());
if (container.has_data_roaming_enabled()) {
- policies->Set(key::kDeviceDataRoamingEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.data_roaming_enabled()),
- nullptr);
+ policies->Set(
+ key::kDeviceDataRoamingEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.data_roaming_enabled()),
+ nullptr);
}
}
@@ -439,60 +434,57 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.has_device_reporting()) {
const em::DeviceReportingProto& container(policy.device_reporting());
if (container.has_report_version_info()) {
- policies->Set(key::kReportDeviceVersionInfo, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.report_version_info()),
- nullptr);
+ policies->Set(
+ key::kReportDeviceVersionInfo, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.report_version_info()),
+ nullptr);
}
if (container.has_report_activity_times()) {
- policies->Set(key::kReportDeviceActivityTimes, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.report_activity_times()),
- nullptr);
+ policies->Set(
+ key::kReportDeviceActivityTimes, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.report_activity_times()),
+ nullptr);
}
if (container.has_report_boot_mode()) {
policies->Set(key::kReportDeviceBootMode, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.report_boot_mode()),
+ base::MakeUnique<base::Value>(container.report_boot_mode()),
nullptr);
}
if (container.has_report_location()) {
+ policies->Set(key::kReportDeviceLocation, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.report_location()),
+ nullptr);
+ }
+ if (container.has_report_network_interfaces()) {
policies->Set(
- key::kReportDeviceLocation, POLICY_LEVEL_MANDATORY,
+ key::kReportDeviceNetworkInterfaces, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.report_location()),
+ base::MakeUnique<base::Value>(container.report_network_interfaces()),
nullptr);
}
- if (container.has_report_network_interfaces()) {
- policies->Set(key::kReportDeviceNetworkInterfaces, POLICY_LEVEL_MANDATORY,
+ if (container.has_report_users()) {
+ policies->Set(key::kReportDeviceUsers, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.report_network_interfaces()),
+ base::MakeUnique<base::Value>(container.report_users()),
nullptr);
}
- if (container.has_report_users()) {
+ if (container.has_report_hardware_status()) {
policies->Set(
- key::kReportDeviceUsers, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.report_users()),
+ key::kReportDeviceHardwareStatus, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.report_hardware_status()),
nullptr);
}
- if (container.has_report_hardware_status()) {
- policies->Set(key::kReportDeviceHardwareStatus, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.report_hardware_status()),
- nullptr);
- }
if (container.has_report_session_status()) {
- policies->Set(key::kReportDeviceSessionStatus, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.report_session_status()),
- nullptr);
+ policies->Set(
+ key::kReportDeviceSessionStatus, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.report_session_status()),
+ nullptr);
}
if (container.has_device_status_frequency()) {
policies->Set(key::kReportUploadFrequency, POLICY_LEVEL_MANDATORY,
@@ -506,11 +498,11 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy,
const em::DeviceHeartbeatSettingsProto& container(
policy.device_heartbeat_settings());
if (container.has_heartbeat_enabled()) {
- policies->Set(key::kHeartbeatEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.heartbeat_enabled()),
- nullptr);
+ policies->Set(
+ key::kHeartbeatEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.heartbeat_enabled()),
+ nullptr);
}
if (container.has_heartbeat_frequency()) {
policies->Set(key::kHeartbeatFrequency, POLICY_LEVEL_MANDATORY,
@@ -524,11 +516,11 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy,
const em::DeviceLogUploadSettingsProto& container(
policy.device_log_upload_settings());
if (container.has_system_log_upload_enabled()) {
- policies->Set(key::kLogUploadEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.system_log_upload_enabled()),
- nullptr);
+ policies->Set(
+ key::kLogUploadEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.system_log_upload_enabled()),
+ nullptr);
}
}
}
@@ -549,23 +541,21 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy,
SetChannel(channel, false);
}
if (container.has_release_channel_delegated()) {
- policies->Set(key::kChromeOsReleaseChannelDelegated,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.release_channel_delegated()),
- nullptr);
+ policies->Set(
+ key::kChromeOsReleaseChannelDelegated, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.release_channel_delegated()),
+ nullptr);
}
}
if (policy.has_auto_update_settings()) {
const em::AutoUpdateSettingsProto& container(policy.auto_update_settings());
if (container.has_update_disabled()) {
- policies->Set(
- key::kDeviceAutoUpdateDisabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.update_disabled()),
- nullptr);
+ policies->Set(key::kDeviceAutoUpdateDisabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.update_disabled()),
+ nullptr);
}
if (container.has_target_version_prefix()) {
@@ -583,7 +573,7 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy,
// TODO(dcheng): Shouldn't this use DecodeIntegerValue?
policies->Set(key::kDeviceUpdateScatterFactor, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(static_cast<int>(
+ base::MakeUnique<base::Value>(static_cast<int>(
container.scatter_factor_in_seconds())),
nullptr);
}
@@ -603,28 +593,26 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy,
}
if (container.has_http_downloads_enabled()) {
- policies->Set(key::kDeviceUpdateHttpDownloadsEnabled,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.http_downloads_enabled()),
- nullptr);
+ policies->Set(
+ key::kDeviceUpdateHttpDownloadsEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.http_downloads_enabled()),
+ nullptr);
}
if (container.has_reboot_after_update()) {
- policies->Set(key::kRebootAfterUpdate, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.reboot_after_update()),
- nullptr);
+ policies->Set(
+ key::kRebootAfterUpdate, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.reboot_after_update()),
+ nullptr);
}
if (container.has_p2p_enabled()) {
- policies->Set(
- key::kDeviceAutoUpdateP2PEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.p2p_enabled()),
- nullptr);
+ policies->Set(key::kDeviceAutoUpdateP2PEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.p2p_enabled()),
+ nullptr);
}
}
@@ -635,7 +623,7 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(key::kAllowKioskAppControlChromeVersion,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
container.allow_kiosk_app_control_chrome_version()),
nullptr);
}
@@ -652,7 +640,7 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(key::kDeviceLoginScreenDefaultLargeCursorEnabled,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
container.login_screen_default_large_cursor_enabled()),
nullptr);
}
@@ -661,7 +649,7 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(
key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
container.login_screen_default_spoken_feedback_enabled()),
nullptr);
}
@@ -670,7 +658,7 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(key::kDeviceLoginScreenDefaultHighContrastEnabled,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
container.login_screen_default_high_contrast_enabled()),
nullptr);
}
@@ -688,7 +676,7 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(
key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
container.login_screen_default_virtual_keyboard_enabled()),
nullptr);
}
@@ -711,11 +699,10 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.has_metrics_enabled()) {
const em::MetricsEnabledProto& container(policy.metrics_enabled());
if (container.has_metrics_enabled()) {
- policies->Set(
- key::kDeviceMetricsReportingEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.metrics_enabled()),
- nullptr);
+ policies->Set(key::kDeviceMetricsReportingEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.metrics_enabled()),
+ nullptr);
}
}
@@ -743,7 +730,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.use_24hour_clock().has_use_24hour_clock()) {
policies->Set(key::kSystemUse24HourClock, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
policy.use_24hour_clock().use_24hour_clock()),
nullptr);
}
@@ -753,12 +740,11 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
const em::AllowRedeemChromeOsRegistrationOffersProto& container(
policy.allow_redeem_offers());
if (container.has_allow_redeem_offers()) {
- policies->Set(key::kDeviceAllowRedeemChromeOsRegistrationOffers,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.allow_redeem_offers()),
- nullptr);
+ policies->Set(
+ key::kDeviceAllowRedeemChromeOsRegistrationOffers,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.allow_redeem_offers()),
+ nullptr);
}
}
@@ -796,7 +782,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.attestation_settings().has_attestation_enabled()) {
policies->Set(key::kAttestationEnabledForDevice, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
policy.attestation_settings().attestation_enabled()),
nullptr);
}
@@ -804,7 +790,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
policies->Set(
key::kAttestationForContentProtectionEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
policy.attestation_settings().content_protection_enabled()),
nullptr);
}
@@ -813,11 +799,10 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
if (policy.has_system_settings()) {
const em::SystemSettingsProto& container(policy.system_settings());
if (container.has_block_devmode()) {
- policies->Set(
- key::kDeviceBlockDevmode, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(container.block_devmode()),
- nullptr);
+ policies->Set(key::kDeviceBlockDevmode, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.block_devmode()),
+ nullptr);
}
}
@@ -863,11 +848,11 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
const em::DeviceQuirksDownloadEnabledProto& container(
policy.quirks_download_enabled());
if (container.has_quirks_download_enabled()) {
- policies->Set(key::kDeviceQuirksDownloadEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
- container.quirks_download_enabled()),
- nullptr);
+ policies->Set(
+ key::kDeviceQuirksDownloadEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::Value>(container.quirks_download_enabled()),
+ nullptr);
}
}
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698