Implement the windows policy provider based on the AsyncPolicyLoader.

chrome/browser/policy/policy_loader_win_unittest.cc

Index: chrome/browser/policy/policy_loader_win_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/policy_loader_win_unittest.cc
similarity index 91%
rename from chrome/browser/policy/configuration_policy_provider_win_unittest.cc
rename to chrome/browser/policy/policy_loader_win_unittest.cc
index d8d9142353c6210eba7169326691a3bf1f41eec0..f43eea9e02c2f1e21c5080a0a7219b71d00b6bf5 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/policy_loader_win_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
+#include "chrome/browser/policy/policy_loader_win.h"
+
 #include <windows.h>
 
 #include "base/json/json_writer.h"
@@ -10,9 +11,8 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
-#include "chrome/browser/policy/asynchronous_policy_test_base.h"
+#include "chrome/browser/policy/async_policy_provider.h"
 #include "chrome/browser/policy/configuration_policy_provider_test.h"
-#include "chrome/browser/policy/configuration_policy_provider_win.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "policy/policy_constants.h"
@@ -140,8 +140,9 @@ TestHarness::~TestHarness() {}
 void TestHarness::SetUp() {}
 
 ConfigurationPolicyProvider* TestHarness::CreateProvider(
-    const PolicyDefinitionList* policy_definition_list) {
-  return new ConfigurationPolicyProviderWin(policy_definition_list);
+    const PolicyDefinitionList* policy_list) {
+  scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderWin(policy_list));
+  return new AsyncPolicyProvider(policy_list, loader.Pass());
 }
 
 void TestHarness::InstallEmptyPolicy() {}
@@ -210,22 +211,20 @@ PolicyProviderTestHarness* TestHarness::CreateHKLM() {
 
 // Instantiate abstract test case for basic policy reading tests.
 INSTANTIATE_TEST_CASE_P(
-    ConfigurationPolicyProviderWinTest,
+    PolicyProviderWinTest,
     ConfigurationPolicyProviderTest,
     testing::Values(TestHarness::CreateHKCU, TestHarness::CreateHKLM));
 
 // Test cases for windows policy provider specific functionality.
-class ConfigurationPolicyProviderWinTest : public AsynchronousPolicyTestBase {
+class PolicyLoaderWinTest : public PolicyTestBase {
  protected:
-  ConfigurationPolicyProviderWinTest()
-      : provider_(&test_policy_definitions::kList) {}
-  virtual ~ConfigurationPolicyProviderWinTest() {}
+  PolicyLoaderWinTest() {}
+  virtual ~PolicyLoaderWinTest() {}
 
   ScopedGroupPolicyRegistrySandbox registry_sandbox_;
-  ConfigurationPolicyProviderWin provider_;
 };
 
-TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
+TEST_F(PolicyLoaderWinTest, HKLMOverHKCU) {
   RegKey hklm_key(HKEY_LOCAL_MACHINE,
                   policy::kRegistryMandatorySubKey,
                   KEY_ALL_ACCESS);
@@ -237,7 +236,10 @@ TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
   hkcu_key.WriteValue(UTF8ToUTF16(test_policy_definitions::kKeyString).c_str(),
                       UTF8ToUTF16("hkcu").c_str());
 
-  provider_.RefreshPolicies();
+  scoped_ptr<AsyncPolicyLoader> loader(
+      new PolicyLoaderWin(&test_policy_definitions::kList));
+  AsyncPolicyProvider provider(&test_policy_definitions::kList, loader.Pass());

[Mattias Nissler (ping if slow), 2012/06/06 13:24:52]

Same as noted on the other CL: We actually don't need a provider to test
PolicyLoaderWin. In this case, there's only one simple test case, maybe it's
worth removing the provider here?

[Joao da Silva, 2012/06/06 14:47:24]

Done.

+  provider.RefreshPolicies();
   loop_.RunAllPending();
 
   PolicyBundle expected_bundle;
@@ -246,7 +248,7 @@ TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
            POLICY_LEVEL_MANDATORY,
            POLICY_SCOPE_MACHINE,
            base::Value::CreateStringValue("hklm"));
-  EXPECT_TRUE(provider_.policies().Equals(expected_bundle));
+  EXPECT_TRUE(provider.policies().Equals(expected_bundle));
 }
 
 }  // namespace policy