Skip to content

GitLab

T
tangled
Commit 61801400 authored by Aya ElAttar's avatar Aya ElAttar Committed by Commit Bot
Browse files
Options

Migrate PolicyMap::Set to use base::Value 

Changed PolicyMap::Set to pass value parameter
as base::Value instead of unique_ptr.

Bug: 2270317
Change-Id: I18dd2696a46ee64b13254b41a36b011b7d29c3de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284840Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Aya Elsayed <ayaelattar@google.com>
Cr-Commit-Position: refs/heads/master@{#786408}
parent bd822e21
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 151 deletions
chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
View file @ 61801400
...@@ -524,8 +524,8 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) { ...@@ -524,8 +524,8 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) {
chromeos::onc::test_utils::ReadTestData("toplevel_partially_invalid.onc"); chromeos::onc::test_utils::ReadTestData("toplevel_partially_invalid.onc");
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(onc_policy),
std::make_unique<base::Value>(onc_policy), nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
EXPECT_CALL(network_config_handler_, EXPECT_CALL(network_config_handler_,
...@@ -564,8 +564,8 @@ TEST_F(NetworkConfigurationUpdaterTest, ...@@ -564,8 +564,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
std::make_unique<base::Value>(kFakeONC), nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
MarkPolicyProviderInitialized(); MarkPolicyProviderInitialized();
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
...@@ -616,8 +616,8 @@ TEST_F(NetworkConfigurationUpdaterTest, ...@@ -616,8 +616,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
// Change to ONC policy with web trust certs. // Change to ONC policy with web trust certs.
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
std::make_unique<base::Value>(kFakeONC), nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
...@@ -651,8 +651,7 @@ TEST_F(NetworkConfigurationUpdaterTest, ExtensionScopedWebTrustedCertificate) { ...@@ -651,8 +651,7 @@ TEST_F(NetworkConfigurationUpdaterTest, ExtensionScopedWebTrustedCertificate) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(kFakeONCWithExtensionScopedCert), base::Value(kFakeONCWithExtensionScopedCert), nullptr);
nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
MarkPolicyProviderInitialized(); MarkPolicyProviderInitialized();
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
...@@ -681,8 +680,8 @@ TEST_F(NetworkConfigurationUpdaterTest, ...@@ -681,8 +680,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
DontImportCertificateBeforeCertificateImporterSet) { DontImportCertificateBeforeCertificateImporterSet) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
std::make_unique<base::Value>(kFakeONC), nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
::onc::ONCSource source = onc::ONC_SOURCE_USER_POLICY; ::onc::ONCSource source = onc::ONC_SOURCE_USER_POLICY;
...@@ -711,8 +710,8 @@ TEST_F(NetworkConfigurationUpdaterTest, ...@@ -711,8 +710,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
TEST_F(NetworkConfigurationUpdaterTest, ReplaceDeviceOncPlaceholders) { TEST_F(NetworkConfigurationUpdaterTest, ReplaceDeviceOncPlaceholders) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
std::make_unique<base::Value>(kFakeONC), nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
::onc::ONCSource source = onc::ONC_SOURCE_DEVICE_POLICY; ::onc::ONCSource source = onc::ONC_SOURCE_DEVICE_POLICY;
...@@ -754,7 +753,7 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsNo) { ...@@ -754,7 +753,7 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsNo) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(kONCWithoutWebTrustedCert), nullptr); base::Value(kONCWithoutWebTrustedCert), nullptr);
EXPECT_FALSE( EXPECT_FALSE(
UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate( UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate(
policy)); policy));
...@@ -792,7 +791,7 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsYes) { ...@@ -792,7 +791,7 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsYes) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(kONCWithWebTrustedCert), nullptr); base::Value(kONCWithWebTrustedCert), nullptr);
EXPECT_TRUE( EXPECT_TRUE(
UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate( UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate(
policy)); policy));
...@@ -809,8 +808,8 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsInvalidPolicy) { ...@@ -809,8 +808,8 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsInvalidPolicy) {
const char kInvalidONC[] = "not even valid json"; const char kInvalidONC[] = "not even valid json";
PolicyMap policy; PolicyMap policy;
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kInvalidONC),
std::make_unique<base::Value>(kInvalidONC), nullptr); nullptr);
EXPECT_FALSE( EXPECT_FALSE(
UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate( UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate(
policy)); policy));
...@@ -855,8 +854,7 @@ class NetworkConfigurationUpdaterTestWithParam ...@@ -855,8 +854,7 @@ class NetworkConfigurationUpdaterTestWithParam
TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) { TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) {
PolicyMap policy; PolicyMap policy;
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC), POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
EXPECT_CALL( EXPECT_CALL(
...@@ -877,8 +875,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, ...@@ -877,8 +875,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam,
PolicyNotSetBeforePolicyProviderInitialized) { PolicyNotSetBeforePolicyProviderInitialized) {
PolicyMap policy; PolicyMap policy;
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC), POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
CreateNetworkConfigurationUpdater(); CreateNetworkConfigurationUpdater();
...@@ -905,8 +902,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, ...@@ -905,8 +902,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam,
PolicyMap policy; PolicyMap policy;
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC), POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
EXPECT_CALL( EXPECT_CALL(
...@@ -946,8 +942,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) { ...@@ -946,8 +942,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) {
PolicyMap policy; PolicyMap policy;
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC), POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
Mock::VerifyAndClearExpectations(&network_config_handler_); Mock::VerifyAndClearExpectations(&network_config_handler_);
EXPECT_EQ(ExpectedImportCertificatesCallCount(), EXPECT_EQ(ExpectedImportCertificatesCallCount(),
......
chrome/browser/extensions/policy_handlers_unittest.cc
View file @ 61801400
...@@ -68,7 +68,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { ...@@ -68,7 +68,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
policy_map.Set(policy::key::kExtensionInstallBlacklist, policy_map.Set(policy::key::kExtensionInstallBlacklist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -76,7 +76,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { ...@@ -76,7 +76,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("abcdefghijklmnopabcdefghijklmnop"); list.AppendString("abcdefghijklmnopabcdefghijklmnop");
policy_map.Set(policy::key::kExtensionInstallBlacklist, policy_map.Set(policy::key::kExtensionInstallBlacklist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -84,7 +84,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { ...@@ -84,7 +84,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("*"); list.AppendString("*");
policy_map.Set(policy::key::kExtensionInstallBlacklist, policy_map.Set(policy::key::kExtensionInstallBlacklist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -92,7 +92,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { ...@@ -92,7 +92,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("invalid"); list.AppendString("invalid");
policy_map.Set(policy::key::kExtensionInstallBlacklist, policy_map.Set(policy::key::kExtensionInstallBlacklist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty()); EXPECT_FALSE(errors.empty());
...@@ -124,10 +124,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsURL) { ...@@ -124,10 +124,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsURL) {
policy::PolicyMap policy_map; policy::PolicyMap policy_map;
ExtensionSettingsPolicyHandler handler(chrome_schema); ExtensionSettingsPolicyHandler handler(chrome_schema);
policy_map.Set( policy_map.Set(policy::key::kExtensionSettings,
policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, policy::POLICY_SOURCE_CLOUD, std::move(*policy_value),
base::Value::ToUniquePtrValue(std::move(*policy_value)), nullptr); nullptr);
policy::PolicyErrorMap errors; policy::PolicyErrorMap errors;
return handler.CheckPolicySettings(policy_map, &errors) && errors.empty(); return handler.CheckPolicySettings(policy_map, &errors) && errors.empty();
...@@ -158,7 +158,7 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { ...@@ -158,7 +158,7 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
policy_map.Set(policy::key::kExtensionInstallBlacklist, policy_map.Set(policy::key::kExtensionInstallBlacklist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, policy.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_EQ(expected, *value); EXPECT_EQ(expected, *value);
...@@ -166,7 +166,7 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { ...@@ -166,7 +166,7 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
policy.AppendString("invalid"); policy.AppendString("invalid");
policy_map.Set(policy::key::kExtensionInstallBlacklist, policy_map.Set(policy::key::kExtensionInstallBlacklist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, policy.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_EQ(expected, *value); EXPECT_EQ(expected, *value);
...@@ -181,7 +181,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { ...@@ -181,7 +181,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) {
// Start with an empty policy. // Start with an empty policy.
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -190,7 +190,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { ...@@ -190,7 +190,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("abcdefghijklmnopabcdefghijklmnop;http://example.com"); list.AppendString("abcdefghijklmnopabcdefghijklmnop;http://example.com");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -200,7 +200,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { ...@@ -200,7 +200,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("adfasdf;http://example.com"); list.AppendString("adfasdf;http://example.com");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_EQ(1U, errors.size()); EXPECT_EQ(1U, errors.size());
...@@ -209,7 +209,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { ...@@ -209,7 +209,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("abcdefghijklmnopabcdefghijklmnop;nourl"); list.AppendString("abcdefghijklmnopabcdefghijklmnop;nourl");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_EQ(2U, errors.size()); EXPECT_EQ(2U, errors.size());
...@@ -218,7 +218,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { ...@@ -218,7 +218,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("abcdefghijklmnopabcdefghijklmnop"); list.AppendString("abcdefghijklmnopabcdefghijklmnop");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_EQ(2U, errors.size()); EXPECT_EQ(2U, errors.size());
...@@ -240,7 +240,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { ...@@ -240,7 +240,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) {
// Set the policy to an empty value. This shouldn't affect the pref. // Set the policy to an empty value. This shouldn't affect the pref.
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, policy.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value)); EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value));
EXPECT_EQ(expected, *value); EXPECT_EQ(expected, *value);
...@@ -252,7 +252,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { ...@@ -252,7 +252,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) {
&expected, "abcdefghijklmnopabcdefghijklmnop", "http://example.com"); &expected, "abcdefghijklmnopabcdefghijklmnop", "http://example.com");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, policy.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value)); EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value));
EXPECT_EQ(expected, *value); EXPECT_EQ(expected, *value);
...@@ -268,7 +268,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { ...@@ -268,7 +268,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) {
"https://clients2.google.com/service/update2/crx"); "https://clients2.google.com/service/update2/crx");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, policy.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value)); EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value));
EXPECT_EQ(expected, *value); EXPECT_EQ(expected, *value);
...@@ -277,7 +277,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { ...@@ -277,7 +277,7 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) {
policy.AppendString("invalid"); policy.AppendString("invalid");
policy_map.Set(policy::key::kExtensionInstallForcelist, policy_map.Set(policy::key::kExtensionInstallForcelist,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, policy.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value)); EXPECT_TRUE(prefs.GetValue(pref_names::kInstallForceList, &value));
EXPECT_EQ(expected, *value); EXPECT_EQ(expected, *value);
...@@ -292,7 +292,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { ...@@ -292,7 +292,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
policy_map.Set(policy::key::kExtensionInstallSources, policy_map.Set(policy::key::kExtensionInstallSources,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -300,7 +300,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { ...@@ -300,7 +300,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("http://*.google.com/*"); list.AppendString("http://*.google.com/*");
policy_map.Set(policy::key::kExtensionInstallSources, policy_map.Set(policy::key::kExtensionInstallSources,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -308,7 +308,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { ...@@ -308,7 +308,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("<all_urls>"); list.AppendString("<all_urls>");
policy_map.Set(policy::key::kExtensionInstallSources, policy_map.Set(policy::key::kExtensionInstallSources,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty()); EXPECT_TRUE(errors.empty());
...@@ -316,7 +316,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { ...@@ -316,7 +316,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("invalid"); list.AppendString("invalid");
policy_map.Set(policy::key::kExtensionInstallSources, policy_map.Set(policy::key::kExtensionInstallSources,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty()); EXPECT_FALSE(errors.empty());
...@@ -327,7 +327,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { ...@@ -327,7 +327,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
list.AppendString("*"); list.AppendString("*");
policy_map.Set(policy::key::kExtensionInstallSources, policy_map.Set(policy::key::kExtensionInstallSources,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
errors.Clear(); errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty()); EXPECT_FALSE(errors.empty());
...@@ -345,7 +345,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) { ...@@ -345,7 +345,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
list.AppendString("https://corp.monkey.net/*"); list.AppendString("https://corp.monkey.net/*");
policy_map.Set(policy::key::kExtensionInstallSources, policy_map.Set(policy::key::kExtensionInstallSources,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); policy::POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
ASSERT_TRUE(prefs.GetValue(kTestPref, &value)); ASSERT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_EQ(list, *value); EXPECT_EQ(list, *value);
...@@ -364,10 +364,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) { ...@@ -364,10 +364,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) {
policy::PolicyErrorMap errors; policy::PolicyErrorMap errors;
ExtensionSettingsPolicyHandler handler(chrome_schema); ExtensionSettingsPolicyHandler handler(chrome_schema);
policy_map.Set( policy_map.Set(policy::key::kExtensionSettings,
policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, policy::POLICY_SOURCE_CLOUD, std::move(*policy_result.value),
base::Value::ToUniquePtrValue(std::move(*policy_result.value)), nullptr); nullptr);
// CheckPolicySettings() fails due to missing update URL. // CheckPolicySettings() fails due to missing update URL.
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty()); EXPECT_FALSE(errors.empty());
...@@ -401,7 +401,7 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsTooManyHosts) { ...@@ -401,7 +401,7 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsTooManyHosts) {
policy_map.Set(policy::key::kExtensionSettings, policy_map.Set(policy::key::kExtensionSettings,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, policy::POLICY_SOURCE_CLOUD,
policy_value.value.value().CreateDeepCopy(), nullptr); policy_value.value.value().Clone(), nullptr);
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_EQ(2u, errors.size()); EXPECT_EQ(2u, errors.size());
...@@ -436,10 +436,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, ApplyPolicySettings) { ...@@ -436,10 +436,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, ApplyPolicySettings) {
PrefValueMap prefs; PrefValueMap prefs;
ExtensionSettingsPolicyHandler handler(chrome_schema); ExtensionSettingsPolicyHandler handler(chrome_schema);
policy_map.Set( policy_map.Set(policy::key::kExtensionSettings,
policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, policy::POLICY_SOURCE_CLOUD, policy_result.value->Clone(),
base::Value::ToUniquePtrValue(policy_result.value->Clone()), nullptr); nullptr);
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
handler.ApplyPolicySettings(policy_map, &prefs); handler.ApplyPolicySettings(policy_map, &prefs);
base::Value* value = NULL; base::Value* value = NULL;
...@@ -466,10 +466,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, NonManagedOffWebstoreExtension) { ...@@ -466,10 +466,10 @@ TEST(ExtensionSettingsPolicyHandlerTest, NonManagedOffWebstoreExtension) {
PrefValueMap prefs; PrefValueMap prefs;
ExtensionSettingsPolicyHandler handler(chrome_schema); ExtensionSettingsPolicyHandler handler(chrome_schema);
policy_map.Set( policy_map.Set(policy::key::kExtensionSettings,
policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, policy::POLICY_SOURCE_CLOUD, policy_result.value->Clone(),
base::Value::ToUniquePtrValue(policy_result.value->Clone()), nullptr); nullptr);
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty()); EXPECT_FALSE(errors.empty());
} }
......
components/policy/core/common/schema_map_unittest.cc
View file @ 61801400
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/optional.h"
#include "base/values.h" #include "base/values.h"
#include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/external_data_fetcher.h"
#include "components/policy/core/common/external_data_manager.h" #include "components/policy/core/common/external_data_manager.h"
...@@ -141,17 +142,16 @@ TEST_F(SchemaMapTest, FilterBundle) { ...@@ -141,17 +142,16 @@ TEST_F(SchemaMapTest, FilterBundle) {
// The Chrome namespace isn't filtered. // The Chrome namespace isn't filtered.
PolicyBundle expected_bundle; PolicyBundle expected_bundle;
PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, ""); PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
expected_bundle.Get(chrome_ns).Set( expected_bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
"ChromePolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"), nullptr); base::Value("value"), nullptr);
bundle.CopyFrom(expected_bundle); bundle.CopyFrom(expected_bundle);
// Unknown components are filtered out. // Unknown components are filtered out.
PolicyNamespace another_extension_ns(POLICY_DOMAIN_EXTENSIONS, "xyz"); PolicyNamespace another_extension_ns(POLICY_DOMAIN_EXTENSIONS, "xyz");
bundle.Get(another_extension_ns) bundle.Get(another_extension_ns)
.Set("AnotherExtensionPolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("AnotherExtensionPolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"), POLICY_SOURCE_CLOUD, base::Value("value"), nullptr);
nullptr);
schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true); schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
EXPECT_TRUE(bundle.Equals(expected_bundle)); EXPECT_TRUE(bundle.Equals(expected_bundle));
...@@ -161,26 +161,25 @@ TEST_F(SchemaMapTest, FilterBundle) { ...@@ -161,26 +161,25 @@ TEST_F(SchemaMapTest, FilterBundle) {
list.AppendString("a"); list.AppendString("a");
list.AppendString("b"); list.AppendString("b");
map.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, map.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
map.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, map.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(true), nullptr); POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
map.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, map.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr); POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1.2), nullptr); POLICY_SOURCE_CLOUD, base::Value(1.2), nullptr);
base::DictionaryValue dict; base::DictionaryValue dict;
dict.SetString("a", "b"); dict.SetString("a", "b");
dict.SetInteger("b", 2); dict.SetInteger("b", 2);
map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, dict.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, dict.Clone(), nullptr);
map.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, map.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"), nullptr); POLICY_SOURCE_CLOUD, base::Value("value"), nullptr);
bundle.MergeFrom(expected_bundle); bundle.MergeFrom(expected_bundle);
bundle.Get(extension_ns) bundle.Get(extension_ns)
.Set("Unexpected", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Unexpected", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("to-be-removed"), POLICY_SOURCE_CLOUD, base::Value("to-be-removed"), nullptr);
nullptr);
schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true); schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
// Merged twice so this causes a conflict. // Merged twice so this causes a conflict.
...@@ -197,24 +196,19 @@ TEST_F(SchemaMapTest, FilterBundle) { ...@@ -197,24 +196,19 @@ TEST_F(SchemaMapTest, FilterBundle) {
bundle.Clear(); bundle.Clear();
PolicyMap& badmap = bundle.Get(extension_ns); PolicyMap& badmap = bundle.Get(extension_ns);
badmap.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false), POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
nullptr);
badmap.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr); POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
badmap.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false), POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
nullptr);
badmap.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false), POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
nullptr);
badmap.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false), POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
nullptr);
badmap.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false), POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
nullptr);
badmap.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, badmap.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, nullptr, POLICY_SOURCE_CLOUD, base::nullopt,
std::make_unique<ExternalDataFetcher>(nullptr, std::string())); std::make_unique<ExternalDataFetcher>(nullptr, std::string()));
schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true); schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
...@@ -246,14 +240,13 @@ TEST_F(SchemaMapTest, LegacyComponents) { ...@@ -246,14 +240,13 @@ TEST_F(SchemaMapTest, LegacyComponents) {
PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema"); PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema");
bundle.Get(extension_ns) bundle.Get(extension_ns)
.Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 1"), POLICY_SOURCE_CLOUD, base::Value("value 1"), nullptr);
nullptr);
// The Chrome namespace isn't filtered. // The Chrome namespace isn't filtered.
PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, ""); PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY, bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>("value 3"), nullptr); base::Value("value 3"), nullptr);
PolicyBundle expected_bundle; PolicyBundle expected_bundle;
expected_bundle.MergeFrom(bundle); expected_bundle.MergeFrom(bundle);
...@@ -262,22 +255,19 @@ TEST_F(SchemaMapTest, LegacyComponents) { ...@@ -262,22 +255,19 @@ TEST_F(SchemaMapTest, LegacyComponents) {
PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema"); PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema");
bundle.Get(without_schema_ns) bundle.Get(without_schema_ns)
.Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 2"), POLICY_SOURCE_CLOUD, base::Value("value 2"), nullptr);
nullptr);
// Unknown policies of known components with a schema are removed when // Unknown policies of known components with a schema are removed when
// |drop_invalid_component_policies| is true in the FilterBundle call. // |drop_invalid_component_policies| is true in the FilterBundle call.
bundle.Get(extension_ns) bundle.Get(extension_ns)
.Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 4"), POLICY_SOURCE_CLOUD, base::Value("value 4"), nullptr);
nullptr);
// Unknown components are removed. // Unknown components are removed.
PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown"); PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown");
bundle.Get(unknown_ns) bundle.Get(unknown_ns)
.Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 5"), POLICY_SOURCE_CLOUD, base::Value("value 5"), nullptr);
nullptr);
schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true); schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
EXPECT_TRUE(bundle.Equals(expected_bundle)); EXPECT_TRUE(bundle.Equals(expected_bundle));
...@@ -308,28 +298,25 @@ TEST_F(SchemaMapTest, FilterBundleInvalidatesPolicies) { ...@@ -308,28 +298,25 @@ TEST_F(SchemaMapTest, FilterBundleInvalidatesPolicies) {
PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema"); PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema");
bundle.Get(extension_ns) bundle.Get(extension_ns)
.Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 1"), POLICY_SOURCE_CLOUD, base::Value("value 1"), nullptr);
nullptr);
// The Chrome namespace isn't filtered. // The Chrome namespace isn't filtered.
PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, ""); PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY, bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>("value 3"), nullptr); base::Value("value 3"), nullptr);
// Unknown policies of known components with a schema are invalidated when // Unknown policies of known components with a schema are invalidated when
// |drop_invalid_component_policies| is false in the FilterBundle call. // |drop_invalid_component_policies| is false in the FilterBundle call.
bundle.Get(extension_ns) bundle.Get(extension_ns)
.Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 4"), POLICY_SOURCE_CLOUD, base::Value("value 4"), nullptr);
nullptr);
// Known components without a schema are also invalidated. // Known components without a schema are also invalidated.
PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema"); PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema");
bundle.Get(without_schema_ns) bundle.Get(without_schema_ns)
.Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 2"), POLICY_SOURCE_CLOUD, base::Value("value 2"), nullptr);
nullptr);
PolicyBundle expected_bundle; PolicyBundle expected_bundle;
expected_bundle.MergeFrom(bundle); expected_bundle.MergeFrom(bundle);
...@@ -341,8 +328,7 @@ TEST_F(SchemaMapTest, FilterBundleInvalidatesPolicies) { ...@@ -341,8 +328,7 @@ TEST_F(SchemaMapTest, FilterBundleInvalidatesPolicies) {
PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown"); PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown");
bundle.Get(unknown_ns) bundle.Get(unknown_ns)
.Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 5"), POLICY_SOURCE_CLOUD, base::Value("value 5"), nullptr);
nullptr);
// Get a reference to the policies that will be invalidated now, since it can // Get a reference to the policies that will be invalidated now, since it can
// no longer be accessed with Get() after being invalidated. // no longer be accessed with Get() after being invalidated.
......
components/search_engines/default_search_policy_handler_unittest.cc
View file @ 61801400
...@@ -74,42 +74,42 @@ const char DefaultSearchPolicyHandlerTest::kHostName[] = "test.com"; ...@@ -74,42 +74,42 @@ const char DefaultSearchPolicyHandlerTest::kHostName[] = "test.com";
void DefaultSearchPolicyHandlerTest:: void DefaultSearchPolicyHandlerTest::
BuildDefaultSearchPolicy(PolicyMap* policy) { BuildDefaultSearchPolicy(PolicyMap* policy) {
base::ListValue* encodings = new base::ListValue(); base::Value encodings(base::Value::Type::LIST);
encodings->AppendString("UTF-16"); encodings.Append("UTF-16");
encodings->AppendString("UTF-8"); encodings.Append("UTF-8");
policy->Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
std::make_unique<base::Value>(true), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kSearchURL),
std::make_unique<base::Value>(kSearchURL), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kName),
std::make_unique<base::Value>(kName), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kKeyword),
std::make_unique<base::Value>(kKeyword), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kSuggestURL),
std::make_unique<base::Value>(kSuggestURL), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kIconURL),
std::make_unique<base::Value>(kIconURL), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, std::move(encodings),
base::WrapUnique(encodings), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
default_alternate_urls_.CreateDeepCopy(), nullptr); default_alternate_urls_.Clone(), nullptr);
policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kImageURL),
std::make_unique<base::Value>(kImageURL), nullptr); nullptr);
policy->Set(key::kDefaultSearchProviderImageURLPostParams, policy->Set(key::kDefaultSearchProviderImageURLPostParams,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(kImageParams), nullptr); base::Value(kImageParams), nullptr);
policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY, policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kNewTabURL),
std::make_unique<base::Value>(kNewTabURL), nullptr); nullptr);
} }
// Checks that if the default search policy is missing, that no elements of the // Checks that if the default search policy is missing, that no elements of the
...@@ -133,7 +133,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, Invalid) { ...@@ -133,7 +133,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, Invalid) {
const char bad_search_url[] = "http://test.com/noSearchTerms"; const char bad_search_url[] = "http://test.com/noSearchTerms";
policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(bad_search_url), nullptr); base::Value(bad_search_url), nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
const base::Value* temp = nullptr; const base::Value* temp = nullptr;
...@@ -168,13 +168,12 @@ TEST_F(DefaultSearchPolicyHandlerTest, InvalidType) { ...@@ -168,13 +168,12 @@ TEST_F(DefaultSearchPolicyHandlerTest, InvalidType) {
EXPECT_TRUE(store_->GetValue( EXPECT_TRUE(store_->GetValue(
DefaultSearchManager::kDefaultSearchProviderDataPrefName, &temp)); DefaultSearchManager::kDefaultSearchProviderDataPrefName, &temp));
auto old_value = base::WrapUnique(policy.GetValue(policy_name)->DeepCopy()); auto old_value = policy.GetValue(policy_name)->Clone();
// BinaryValue is not supported in any current default search policy params. // BinaryValue is not supported in any current default search policy params.
// Try changing policy param to BinaryValue and check that policy becomes // Try changing policy param to BinaryValue and check that policy becomes
// invalid. // invalid.
policy.Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy.Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, POLICY_SOURCE_CLOUD, base::Value(base::Value::Type::BINARY),
std::make_unique<base::Value>(base::Value::Type::BINARY),
nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
...@@ -248,11 +247,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, FullyDefined) { ...@@ -248,11 +247,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, FullyDefined) {
TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicy) { TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicy) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(false),
std::make_unique<base::Value>(false), nullptr); nullptr);
policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>("http://a/?{searchTerms}"), nullptr); base::Value("http://a/?{searchTerms}"), nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
const base::Value* temp = nullptr; const base::Value* temp = nullptr;
// Ignore any other search provider related policy in this case. // Ignore any other search provider related policy in this case.
...@@ -274,7 +273,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicyNotSet) { ...@@ -274,7 +273,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicyNotSet) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>("http://a/?{searchTerms}"), nullptr); base::Value("http://a/?{searchTerms}"), nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
const base::Value* temp = nullptr; const base::Value* temp = nullptr;
EXPECT_FALSE(store_->GetValue( EXPECT_FALSE(store_->GetValue(
...@@ -287,11 +286,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicyNotSet) { ...@@ -287,11 +286,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicyNotSet) {
TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) { TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
std::make_unique<base::Value>(true), nullptr); nullptr);
policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kSearchURL),
std::make_unique<base::Value>(kSearchURL), nullptr); nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
const base::Value* temp = nullptr; const base::Value* temp = nullptr;
...@@ -340,11 +339,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) { ...@@ -340,11 +339,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
TEST_F(DefaultSearchPolicyHandlerTest, FileURL) { TEST_F(DefaultSearchPolicyHandlerTest, FileURL) {
PolicyMap policy; PolicyMap policy;
policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
std::make_unique<base::Value>(true), nullptr); nullptr);
policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(kFileSearchURL), nullptr); base::Value(kFileSearchURL), nullptr);
UpdateProviderPolicy(policy); UpdateProviderPolicy(policy);
const base::Value* temp = nullptr; const base::Value* temp = nullptr;
......
components/sync/driver/sync_policy_handler_unittest.cc
View file @ 61801400
...@@ -34,7 +34,7 @@ TEST(SyncPolicyHandlerTest, Enabled) { ...@@ -34,7 +34,7 @@ TEST(SyncPolicyHandlerTest, Enabled) {
policy::PolicyMap policy; policy::PolicyMap policy;
policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY, policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(false), nullptr); base::Value(false), nullptr);
SyncPolicyHandler handler; SyncPolicyHandler handler;
PrefValueMap prefs; PrefValueMap prefs;
handler.ApplyPolicySettings(policy, &prefs); handler.ApplyPolicySettings(policy, &prefs);
...@@ -47,7 +47,7 @@ TEST(SyncPolicyHandlerTest, Disabled) { ...@@ -47,7 +47,7 @@ TEST(SyncPolicyHandlerTest, Disabled) {
policy::PolicyMap policy; policy::PolicyMap policy;
policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY, policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(true), nullptr); base::Value(true), nullptr);
SyncPolicyHandler handler; SyncPolicyHandler handler;
PrefValueMap prefs; PrefValueMap prefs;
handler.ApplyPolicySettings(policy, &prefs); handler.ApplyPolicySettings(policy, &prefs);
...@@ -77,8 +77,7 @@ TEST(SyncPolicyHandlerTest, SyncTypesListDisabled) { ...@@ -77,8 +77,7 @@ TEST(SyncPolicyHandlerTest, SyncTypesListDisabled) {
disabled_types.AppendString("preferences"); disabled_types.AppendString("preferences");
policy.Set(policy::key::kSyncTypesListDisabled, policy.Set(policy::key::kSyncTypesListDisabled,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, disabled_types.CreateDeepCopy(), policy::POLICY_SOURCE_CLOUD, disabled_types.Clone(), nullptr);
nullptr);
SyncPolicyHandler handler; SyncPolicyHandler handler;
handler.ApplyPolicySettings(policy, &prefs); handler.ApplyPolicySettings(policy, &prefs);
...@@ -121,8 +120,7 @@ TEST_F(SyncPolicyHandlerOsTest, SyncTypesListDisabled_OsTypes) { ...@@ -121,8 +120,7 @@ TEST_F(SyncPolicyHandlerOsTest, SyncTypesListDisabled_OsTypes) {
disabled_types.AppendString("osWifiConfigurations"); disabled_types.AppendString("osWifiConfigurations");
policy.Set(policy::key::kSyncTypesListDisabled, policy.Set(policy::key::kSyncTypesListDisabled,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, disabled_types.CreateDeepCopy(), policy::POLICY_SOURCE_CLOUD, disabled_types.Clone(), nullptr);
nullptr);
SyncPolicyHandler handler; SyncPolicyHandler handler;
handler.ApplyPolicySettings(policy, &prefs); handler.ApplyPolicySettings(policy, &prefs);
...@@ -151,8 +149,7 @@ TEST_F(SyncPolicyHandlerOsTest, SyncTypesListDisabled_MigratedTypes) { ...@@ -151,8 +149,7 @@ TEST_F(SyncPolicyHandlerOsTest, SyncTypesListDisabled_MigratedTypes) {
disabled_types.AppendString("preferences"); disabled_types.AppendString("preferences");
policy.Set(policy::key::kSyncTypesListDisabled, policy.Set(policy::key::kSyncTypesListDisabled,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, disabled_types.CreateDeepCopy(), policy::POLICY_SOURCE_CLOUD, disabled_types.Clone(), nullptr);
nullptr);
SyncPolicyHandler handler; SyncPolicyHandler handler;
handler.ApplyPolicySettings(policy, &prefs); handler.ApplyPolicySettings(policy, &prefs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment