| Index: chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
|
| index de73d3190230c95e5baca5b58abdb16dcf2b237e..7a90e6611685642ec7505b8abae3369dbcebe2c8 100644
|
| --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
|
| +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/browser/policy/asynchronous_policy_test_base.h"
|
| #include "chrome/browser/policy/configuration_policy_provider_mac.h"
|
| #include "chrome/browser/policy/configuration_policy_provider_test.h"
|
| +#include "chrome/browser/policy/policy_bundle.h"
|
| #include "chrome/browser/policy/policy_map.h"
|
| #include "chrome/browser/preferences_mock_mac.h"
|
| #include "policy/policy_constants.h"
|
| @@ -125,6 +126,9 @@ class TestHarness : public PolicyProviderTestHarness {
|
| virtual AsynchronousPolicyProvider* CreateProvider(
|
| const PolicyDefinitionList* policy_definition_list) OVERRIDE;
|
|
|
| + virtual PolicyLevel GetPolicyLevel() const OVERRIDE;
|
| + virtual PolicyScope GetPolicyScope() const OVERRIDE;
|
| +
|
| virtual void InstallEmptyPolicy() OVERRIDE;
|
| virtual void InstallStringPolicy(const std::string& policy_name,
|
| const std::string& policy_value) OVERRIDE;
|
| @@ -161,6 +165,14 @@ AsynchronousPolicyProvider* TestHarness::CreateProvider(
|
| prefs_);
|
| }
|
|
|
| +PolicyLevel TestHarness::GetPolicyLevel() const {
|
| + return POLICY_LEVEL_MANDATORY;
|
| +}
|
| +
|
| +PolicyScope TestHarness::GetPolicyScope() const {
|
| + return POLICY_SCOPE_USER;
|
| +}
|
| +
|
| void TestHarness::InstallEmptyPolicy() {}
|
|
|
| void TestHarness::InstallStringPolicy(const std::string& policy_name,
|
| @@ -254,11 +266,9 @@ TEST_F(ConfigurationPolicyProviderMacTest, Invalid) {
|
| mandatory_provider_.RefreshPolicies();
|
| recommended_provider_.RefreshPolicies();
|
| loop_.RunAllPending();
|
| - PolicyMap policy_map;
|
| - EXPECT_TRUE(mandatory_provider_.Provide(&policy_map));
|
| - EXPECT_TRUE(policy_map.empty());
|
| - EXPECT_TRUE(recommended_provider_.Provide(&policy_map));
|
| - EXPECT_TRUE(policy_map.empty());
|
| + const PolicyBundle kEmptyBundle;
|
| + EXPECT_TRUE(mandatory_provider_.policies().Equals(kEmptyBundle));
|
| + EXPECT_TRUE(recommended_provider_.policies().Equals(kEmptyBundle));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyProviderMacTest, TestNonForcedValue) {
|
| @@ -274,11 +284,12 @@ TEST_F(ConfigurationPolicyProviderMacTest, TestNonForcedValue) {
|
| mandatory_provider_.RefreshPolicies();
|
| recommended_provider_.RefreshPolicies();
|
| loop_.RunAllPending();
|
| - PolicyMap policy_map;
|
| - EXPECT_TRUE(mandatory_provider_.Provide(&policy_map));
|
| - EXPECT_TRUE(policy_map.empty());
|
| - EXPECT_TRUE(recommended_provider_.Provide(&policy_map));
|
| - EXPECT_EQ(1U, policy_map.size());
|
| + PolicyBundle expected_bundle;
|
| + EXPECT_TRUE(mandatory_provider_.policies().Equals(expected_bundle));
|
| + expected_bundle.Get(POLICY_DOMAIN_CHROME, "")
|
| + .Set(test_policy_definitions::kKeyString, POLICY_LEVEL_RECOMMENDED,
|
| + POLICY_SCOPE_USER, base::Value::CreateStringValue("string value"));
|
| + EXPECT_TRUE(recommended_provider_.policies().Equals(expected_bundle));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyProviderMacTest, TestConversions) {
|
|
|