Implement the mac policy provider based on the AsyncPolicyLoader.

chrome/browser/policy/policy_loader_mac_unittest.cc

Index: chrome/browser/policy/policy_loader_mac_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/policy_loader_mac_unittest.cc
similarity index 91%
rename from chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
rename to chrome/browser/policy/policy_loader_mac_unittest.cc
index 0ff0bb36f0478ad41d482870ccd9e9503e9e5c46..2583ebab66aec5291091a42785c9b3d2e568b81a 100644
--- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
+++ b/chrome/browser/policy/policy_loader_mac_unittest.cc
@@ -8,10 +8,9 @@
 #include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "base/values.h"
-#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_loader_mac.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/preferences_mock_mac.h"
 #include "policy/policy_constants.h"
@@ -123,7 +122,7 @@ class TestHarness : public PolicyProviderTestHarness {
 
   virtual void SetUp() OVERRIDE;
 
-  virtual AsynchronousPolicyProvider* CreateProvider(
+  virtual ConfigurationPolicyProvider* CreateProvider(
       const PolicyDefinitionList* policy_definition_list) OVERRIDE;
 
   virtual void InstallEmptyPolicy() OVERRIDE;
@@ -155,10 +154,11 @@ TestHarness::~TestHarness() {}
 
 void TestHarness::SetUp() {}
 
-AsynchronousPolicyProvider* TestHarness::CreateProvider(
-    const PolicyDefinitionList* policy_definition_list) {
+ConfigurationPolicyProvider* TestHarness::CreateProvider(
+    const PolicyDefinitionList* policy_list) {
   prefs_ = new MockPreferences();
-  return new ConfigurationPolicyProviderMac(policy_definition_list, prefs_);
+  MacPolicyLoader* loader = new MacPolicyLoader(policy_list, prefs_);
+  return new AsyncPolicyProvider(policy_list, loader);
 }
 
 void TestHarness::InstallEmptyPolicy() {}
@@ -214,23 +214,25 @@ PolicyProviderTestHarness* TestHarness::Create() {
 
 // Instantiate abstract test case for basic policy reading tests.
 INSTANTIATE_TEST_CASE_P(
-    ConfigurationPolicyProviderMacTest,
+    MacPolicyLoaderTest,
     ConfigurationPolicyProviderTest,
     testing::Values(TestHarness::Create));
 
 // Special test cases for some mac preferences details.
-class ConfigurationPolicyProviderMacTest : public AsynchronousPolicyTestBase {
+class MacPolicyLoaderTest : public PolicyTestBase {

[Mattias Nissler (ping if slow), 2012/06/04 09:19:02]

Both the test case instance and this test fixture are now called
MacPolicyLoaderTest. gmock can probably handle that, but it'd rather use
different names to avoid confusion in human consumers.

[Joao da Silva, 2012/06/04 17:55:14]

Done.

  protected:
-  ConfigurationPolicyProviderMacTest()
+  MacPolicyLoaderTest()
       : prefs_(new MockPreferences()),
-        provider_(&test_policy_definitions::kList, prefs_) {}
-  virtual ~ConfigurationPolicyProviderMacTest() {}
+        loader_(new MacPolicyLoader(&test_policy_definitions::kList, prefs_)),
+        provider_(&test_policy_definitions::kList, loader_) {}
+  virtual ~MacPolicyLoaderTest() {}
 
   MockPreferences* prefs_;
-  ConfigurationPolicyProviderMac provider_;
+  MacPolicyLoader* loader_;
+  AsyncPolicyProvider provider_;
 };
 
-TEST_F(ConfigurationPolicyProviderMacTest, Invalid) {
+TEST_F(MacPolicyLoaderTest, Invalid) {
   ScopedCFTypeRef<CFStringRef> name(
       base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
   const char buffer[] = "binary \xde\xad\xbe\xef data";
@@ -249,7 +251,7 @@ TEST_F(ConfigurationPolicyProviderMacTest, Invalid) {
   EXPECT_TRUE(provider_.policies().Equals(kEmptyBundle));
 }
 
-TEST_F(ConfigurationPolicyProviderMacTest, TestNonForcedValue) {
+TEST_F(MacPolicyLoaderTest, TestNonForcedValue) {
   ScopedCFTypeRef<CFStringRef> name(
       base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
   ScopedCFTypeRef<CFPropertyListRef> test_value(
@@ -267,7 +269,7 @@ TEST_F(ConfigurationPolicyProviderMacTest, TestNonForcedValue) {
   EXPECT_TRUE(provider_.policies().Equals(expected_bundle));
 }
 
-TEST_F(ConfigurationPolicyProviderMacTest, TestConversions) {
+TEST_F(MacPolicyLoaderTest, TestConversions) {
   base::DictionaryValue root;
 
   // base::Value::TYPE_NULL
@@ -307,7 +309,7 @@ TEST_F(ConfigurationPolicyProviderMacTest, TestConversions) {
   ScopedCFTypeRef<CFPropertyListRef> property(CreatePropertyFromValue(&root));
   ASSERT_TRUE(property);
   scoped_ptr<base::Value> value(
-      MacPreferencesPolicyProviderDelegate::CreateValueFromProperty(property));
+      MacPolicyLoader::CreateValueFromProperty(property));
   ASSERT_TRUE(value.get());
 
   EXPECT_TRUE(root.Equals(value.get()));