Implement the mac policy provider based on the AsyncPolicyLoader.

chrome/browser/policy/policy_loader_mac_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/basictypes.h"
 #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/async_policy_provider.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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::mac::ScopedCFTypeRef;
 
 namespace policy {
 
 namespace {
@@ skipping 91 matching lines @@
   return NULL;
 }
 
 class TestHarness : public PolicyProviderTestHarness {
  public:
   TestHarness();
   virtual ~TestHarness();
 
   virtual void SetUp() OVERRIDE;
 
-  virtual AsynchronousPolicyProvider* CreateProvider(
+  virtual ConfigurationPolicyProvider* CreateProvider(
       const PolicyDefinitionList* policy_definition_list) OVERRIDE;
 
   virtual void InstallEmptyPolicy() OVERRIDE;
   virtual void InstallStringPolicy(const std::string& policy_name,
                                    const std::string& policy_value) OVERRIDE;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
                                     int policy_value) OVERRIDE;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
                                     bool policy_value) OVERRIDE;
   virtual void InstallStringListPolicy(
@@ skipping 11 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestHarness);
 };
 
 TestHarness::TestHarness()
     : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER) {}
 
 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_);
+  scoped_ptr<AsyncPolicyLoader> loader(
+      new MacPolicyLoader(policy_list, prefs_));
+  return new AsyncPolicyProvider(policy_list, loader.Pass());
 }
 
 void TestHarness::InstallEmptyPolicy() {}
 
 void TestHarness::InstallStringPolicy(const std::string& policy_name,
                                       const std::string& policy_value) {
   ScopedCFTypeRef<CFStringRef> name(base::SysUTF8ToCFStringRef(policy_name));
   ScopedCFTypeRef<CFStringRef> value(base::SysUTF8ToCFStringRef(policy_value));
   prefs_->AddTestItem(name, value, true);
 }
@@ skipping 35 matching lines @@
 
 // static
 PolicyProviderTestHarness* TestHarness::Create() {
   return new TestHarness();
 }
 
 }  // namespace
 
 // Instantiate abstract test case for basic policy reading tests.
 INSTANTIATE_TEST_CASE_P(
-    ConfigurationPolicyProviderMacTest,
+    MacPolicyProviderTest,
     ConfigurationPolicyProviderTest,
     testing::Values(TestHarness::Create));
 
 // Special test cases for some mac preferences details.
-class ConfigurationPolicyProviderMacTest : public AsynchronousPolicyTestBase {
+class MacPolicyLoaderTest : public PolicyTestBase {
  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,
+                  scoped_ptr<AsyncPolicyLoader>(loader_)) {}

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

Essentially, we could rewrite these tests now without going through a provider,
but I think that's not something we need to change right now.

+  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";
   ScopedCFTypeRef<CFDataRef> invalid_data(
       CFDataCreate(kCFAllocatorDefault,
                    reinterpret_cast<const UInt8 *>(buffer),
                    arraysize(buffer)));
   ASSERT_TRUE(invalid_data);
   prefs_->AddTestItem(name, invalid_data.get(), true);
   prefs_->AddTestItem(name, invalid_data.get(), false);
 
   // Make the provider read the updated |prefs_|.
   provider_.RefreshPolicies();
   loop_.RunAllPending();
   const PolicyBundle kEmptyBundle;
   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(
       base::SysUTF8ToCFStringRef("string value"));
   ASSERT_TRUE(test_value.get());
   prefs_->AddTestItem(name, test_value.get(), false);
 
   // Make the provider read the updated |prefs_|.
   provider_.RefreshPolicies();
   loop_.RunAllPending();
   PolicyBundle 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(provider_.policies().Equals(expected_bundle));
 }
 
-TEST_F(ConfigurationPolicyProviderMacTest, TestConversions) {
+TEST_F(MacPolicyLoaderTest, TestConversions) {
   base::DictionaryValue root;
 
   // base::Value::TYPE_NULL
   root.Set("null", base::Value::CreateNullValue());
 
   // base::Value::TYPE_BOOLEAN
   root.SetBoolean("false", false);
   root.SetBoolean("true", true);
 
   // base::Value::TYPE_INTEGER
@@ skipping 19 matching lines @@
 
   // base::Value::TYPE_DICTIONARY
   base::DictionaryValue dict;
   root.Set("emptyd", dict.DeepCopy());
   // Very meta.
   root.Set("dict", root.DeepCopy());
 
   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()));
 }
 
 }  // namespace policy