Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/asynchronous_policy_provider_unittest.cc

Index: chrome/browser/policy/asynchronous_policy_provider_unittest.cc
diff --git a/chrome/browser/policy/asynchronous_policy_provider_unittest.cc b/chrome/browser/policy/asynchronous_policy_provider_unittest.cc
index 166526bb88d20788b04481c311b177c41a51105c..1f844044778f0059978c295638c91e7f646916f8 100644
--- a/chrome/browser/policy/asynchronous_policy_provider_unittest.cc
+++ b/chrome/browser/policy/asynchronous_policy_provider_unittest.cc
@@ -23,46 +23,44 @@ namespace policy {
 // Creating the provider should provide initial policy.
 TEST_F(AsynchronousPolicyTestBase, Provide) {
   InSequence s;
-  PolicyMap* policies = new PolicyMap();
-  policies->Set(key::kSyncDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                Value::CreateBooleanValue(true));
+  PolicyBundle* bundle = new PolicyBundle();
+  bundle->Get(POLICY_DOMAIN_CHROME, "")
+      .Set(key::kSyncDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+           base::Value::CreateBooleanValue(true));
   ProviderDelegateMock* delegate = new ProviderDelegateMock();
-  EXPECT_CALL(*delegate, Load()).WillOnce(Return(policies));
+  EXPECT_CALL(*delegate, MockLoad()).WillOnce(Return(bundle));
   AsynchronousPolicyProvider provider(
       GetChromePolicyDefinitionList(),
       new AsynchronousPolicyLoader(delegate, 10));
-  PolicyMap policy_map;
-  provider.Provide(&policy_map);
   base::FundamentalValue expected(true);
-  EXPECT_TRUE(Value::Equals(&expected,
-              policy_map.GetValue(key::kSyncDisabled)));
-  EXPECT_EQ(1U, policy_map.size());
+  const PolicyMap& policies = provider.policies().Get(POLICY_DOMAIN_CHROME, "");
+  EXPECT_TRUE(base::Value::Equals(&expected,
+                                  policies.GetValue(key::kSyncDisabled)));
+  EXPECT_EQ(1U, policies.size());

[Mattias Nissler (ping if slow), 2012/05/14 16:55:59]

Might want to check that other namespaces are empty here.

[Joao da Silva, 2012/05/15 13:07:05]

Done.

 }
 
-
 // Trigger a refresh manually and ensure that policy gets reloaded.
 TEST_F(AsynchronousPolicyTestBase, ProvideAfterRefresh) {
   InSequence s;
-  PolicyMap* original_policies = new PolicyMap();
-  original_policies->Set(key::kSyncDisabled, POLICY_LEVEL_MANDATORY,
-                         POLICY_SCOPE_USER, Value::CreateBooleanValue(true));
+  PolicyBundle* original_policies = new PolicyBundle();
+  original_policies->Get(POLICY_DOMAIN_CHROME, "")
+      .Set(key::kSyncDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+           base::Value::CreateBooleanValue(true));
   ProviderDelegateMock* delegate = new ProviderDelegateMock();
-  EXPECT_CALL(*delegate, Load()).WillOnce(Return(original_policies));
-  PolicyMap* refresh_policies = new PolicyMap();
-  refresh_policies->Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY,
-                        POLICY_SCOPE_USER, Value::CreateBooleanValue(true));
-  EXPECT_CALL(*delegate, Load()).WillOnce(Return(refresh_policies));
+  EXPECT_CALL(*delegate, MockLoad()).WillOnce(Return(original_policies));
+  PolicyBundle* refresh_policies = new PolicyBundle();
+  refresh_policies->Get(POLICY_DOMAIN_CHROME, "")
+      .Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+           base::Value::CreateBooleanValue(true));
+  EXPECT_CALL(*delegate, MockLoad()).WillOnce(Return(refresh_policies));
   AsynchronousPolicyLoader* loader = new AsynchronousPolicyLoader(delegate, 10);
-  AsynchronousPolicyProvider provider(GetChromePolicyDefinitionList(),
-                                      loader);
+  AsynchronousPolicyProvider provider(GetChromePolicyDefinitionList(), loader);
   // The original policies have been loaded.
-  PolicyMap policy_map;
-  provider.Provide(&policy_map);
-  EXPECT_EQ(1U, policy_map.size());
-  base::FundamentalValue expected(true);
-  EXPECT_TRUE(Value::Equals(&expected,
-              policy_map.GetValue(key::kSyncDisabled)));
-  EXPECT_FALSE(policy_map.Get(key::kJavascriptEnabled));
+  PolicyMap expected;
+  expected.Set(key::kSyncDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+               base::Value::CreateBooleanValue(true));
+  EXPECT_TRUE(
+      expected.Equals(provider.policies().Get(POLICY_DOMAIN_CHROME, "")));

[Mattias Nissler (ping if slow), 2012/05/14 16:55:59]

Would be nice if we could just compare the policy bundle here (and below).

[Joao da Silva, 2012/05/15 13:07:05]

Done.

 
   MockConfigurationPolicyObserver observer;
   ConfigurationPolicyObserverRegistrar registrar;
@@ -71,12 +69,11 @@ TEST_F(AsynchronousPolicyTestBase, ProvideAfterRefresh) {
   provider.RefreshPolicies();
   loop_.RunAllPending();
   // The refreshed policies are now provided.
-  policy_map.Clear();
-  provider.Provide(&policy_map);
-  EXPECT_EQ(1U, policy_map.size());
-  EXPECT_TRUE(Value::Equals(&expected,
-              policy_map.GetValue(key::kJavascriptEnabled)));
-  EXPECT_FALSE(policy_map.Get(key::kSyncDisabled));
+  expected.Clear();
+  expected.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY,
+               POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
+  EXPECT_TRUE(
+      expected.Equals(provider.policies().Get(POLICY_DOMAIN_CHROME, "")));
 }
 
 }  // namespace policy