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..3a0da53517f734a3e4529468381a572610261c72 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) { |
bartfab (slow)
2015/09/14 14:42:26
Nit: #include "components/policy/core/common/polic
fhorschig
2015/09/16 13:52:04
Done.
|
+} |
TestHarness::~TestHarness() {} |
@@ -84,42 +85,55 @@ 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_.SetWithSource(policy_name, |
+ policy_level(), |
+ policy_scope(), |
+ 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_.SetWithSource(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_.SetWithSource(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); |
+ store_.policy_map_.SetWithSource(policy_name, |
+ policy_level(), |
+ policy_scope(), |
+ 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(), |
- policy_value->DeepCopy(), nullptr); |
+ store_.policy_map_.SetWithSource(policy_name, |
+ policy_level(), |
+ policy_scope(), |
+ policy_value->DeepCopy(), |
+ nullptr, |
+ POLICY_SOURCE_CLOUD); |
} |
// static |
@@ -173,11 +187,12 @@ 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_.SetWithSource("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_); |