Chromium Code Reviews| Index: components/policy/core/common/cloud/cloud_policy_manager_unittest.cc |
| diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc |
| index 076537f09fd420af243de4aad9f77ffd765c95a7..9b7515833789689fe05c327bcf8bf1420071fda5 100644 |
| --- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc |
| +++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc |
| @@ -62,7 +62,8 @@ class TestHarness : public PolicyProviderTestHarness { |
| }; |
| TestHarness::TestHarness(PolicyLevel level) |
| - : PolicyProviderTestHarness(level, POLICY_SCOPE_USER) {} |
| + : PolicyProviderTestHarness(level, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD) { |
| +} |
| TestHarness::~TestHarness() {} |
| @@ -84,42 +85,38 @@ void TestHarness::InstallEmptyPolicy() {} |
| void TestHarness::InstallStringPolicy(const std::string& policy_name, |
| const std::string& policy_value) { |
| - store_.policy_map_.Set(policy_name, |
| - policy_level(), |
| - policy_scope(), |
| - new base::StringValue(policy_value), |
| - nullptr); |
| + store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), |
|
Thiemo Nagel
2015/09/01 17:40:37
Don't reformat.
fhorschig
2015/09/04 06:53:54
Done.
|
| + new base::StringValue(policy_value), nullptr, |
| + POLICY_SOURCE_CLOUD); |
| } |
| void TestHarness::InstallIntegerPolicy(const std::string& policy_name, |
| int policy_value) { |
| - store_.policy_map_.Set(policy_name, |
| - policy_level(), |
| - policy_scope(), |
| - new base::FundamentalValue(policy_value), |
| - nullptr); |
| + store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), |
| + new base::FundamentalValue(policy_value), nullptr, |
| + POLICY_SOURCE_CLOUD); |
| } |
| void TestHarness::InstallBooleanPolicy(const std::string& policy_name, |
| bool policy_value) { |
| - store_.policy_map_.Set(policy_name, |
| - policy_level(), |
| - policy_scope(), |
| - new base::FundamentalValue(policy_value), |
| - nullptr); |
| + store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), |
| + new base::FundamentalValue(policy_value), nullptr, |
| + POLICY_SOURCE_CLOUD); |
| } |
| void TestHarness::InstallStringListPolicy(const std::string& policy_name, |
| const base::ListValue* policy_value) { |
| store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), |
| - policy_value->DeepCopy(), nullptr); |
| + policy_value->DeepCopy(), nullptr, |
| + POLICY_SOURCE_CLOUD); |
| } |
| void TestHarness::InstallDictionaryPolicy( |
| const std::string& policy_name, |
| const base::DictionaryValue* policy_value) { |
| store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), |
|
Thiemo Nagel
2015/09/01 17:40:37
Except here I would actually reformat in the other
fhorschig
2015/09/04 06:53:54
Done.
|
| - policy_value->DeepCopy(), nullptr); |
| + policy_value->DeepCopy(), nullptr, |
| + POLICY_SOURCE_CLOUD); |
| } |
| // static |
| @@ -173,11 +170,9 @@ class CloudPolicyManagerTest : public testing::Test { |
| void SetUp() override { |
| // Set up a policy map for testing. |
| - policy_map_.Set("key", |
| - POLICY_LEVEL_MANDATORY, |
| - POLICY_SCOPE_USER, |
| - new base::StringValue("value"), |
| - nullptr); |
| + policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
| + new base::StringValue("value"), nullptr, |
| + POLICY_SOURCE_CLOUD); |
| expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
| .CopyFrom(policy_map_); |