Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/configuration_policy_provider_win_unittest.cc

Index: chrome/browser/policy/configuration_policy_provider_win_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index 008fdc132c4b1d15e5a5bca3a1f025132e5ec788..28226b71ad6f6505900b8d9ed4dda2106358bc65 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/policy/asynchronous_policy_test_base.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"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -58,7 +59,7 @@ class ScopedGroupPolicyRegistrySandbox {
 
 class TestHarness : public PolicyProviderTestHarness {
  public:
-  explicit TestHarness(HKEY hive);
+  explicit TestHarness(HKEY hive, PolicyScope scope);
   virtual ~TestHarness();
 
   virtual void SetUp() OVERRIDE;
@@ -66,6 +67,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;
@@ -87,6 +91,7 @@ class TestHarness : public PolicyProviderTestHarness {
 
  private:
   HKEY hive_;
+  PolicyScope policy_scope_;
 
   ScopedGroupPolicyRegistrySandbox registry_sandbox_;
 
@@ -131,8 +136,8 @@ void ScopedGroupPolicyRegistrySandbox::DeleteKeys() {
   key.DeleteKey(L"");
 }
 
-TestHarness::TestHarness(HKEY hive)
-    : hive_(hive) {}
+TestHarness::TestHarness(HKEY hive, PolicyScope scope)
+    : hive_(hive), policy_scope_(scope) {}
 
 TestHarness::~TestHarness() {}
 
@@ -145,6 +150,14 @@ AsynchronousPolicyProvider* TestHarness::CreateProvider(
                                             POLICY_LEVEL_MANDATORY);
 }
 
+PolicyLevel TestHarness::GetPolicyLevel() const {
+  return POLICY_LEVEL_MANDATORY;
+}
+
+PolicyScope TestHarness::GetPolicyScope() const {
+  return policy_scope_;
+}
+
 void TestHarness::InstallEmptyPolicy() {}
 
 void TestHarness::InstallStringPolicy(const std::string& policy_name,
@@ -199,12 +212,12 @@ void TestHarness::InstallDictionaryPolicy(
 
 // static
 PolicyProviderTestHarness* TestHarness::CreateHKCU() {
-  return new TestHarness(HKEY_CURRENT_USER);
+  return new TestHarness(HKEY_CURRENT_USER, POLICY_SCOPE_USER);
 }
 
 // static
 PolicyProviderTestHarness* TestHarness::CreateHKLM() {
-  return new TestHarness(HKEY_LOCAL_MACHINE);
+  return new TestHarness(HKEY_LOCAL_MACHINE, POLICY_SCOPE_MACHINE);
 }
 
 }  // namespace
@@ -243,11 +256,13 @@ TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
   provider_.RefreshPolicies();
   loop_.RunAllPending();
 
-  PolicyMap policy_map;
-  provider_.Provide(&policy_map);
-  const base::Value* value =
-      policy_map.GetValue(test_policy_definitions::kKeyString);
-  EXPECT_TRUE(base::StringValue("hklm").Equals(value));
+  PolicyBundle expected_bundle;
+  expected_bundle.Get(POLICY_DOMAIN_CHROME, "")
+      .Set(test_policy_definitions::kKeyString,
+           POLICY_LEVEL_MANDATORY,
+           POLICY_SCOPE_MACHINE,
+           base::Value::CreateStringValue("hklm"));
+  EXPECT_TRUE(provider_.policies().Equals(expected_bundle));
 }
 
 }  // namespace policy