Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/configuration_policy_provider_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/configuration_policy_provider_test.h"
+#include "chrome/browser/policy/policy_bundle.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 116 matching lines @@
       const base::DictionaryValue* policy_value) OVERRIDE;
 
   static PolicyProviderTestHarness* Create();
 
  private:
   MockPreferences* prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TestHarness);
 };
 
-TestHarness::TestHarness() {}
+TestHarness::TestHarness()
+    : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER) {}
 
 TestHarness::~TestHarness() {}
 
 void TestHarness::SetUp() {}
 
 AsynchronousPolicyProvider* TestHarness::CreateProvider(
     const PolicyDefinitionList* policy_definition_list) {
   prefs_ = new MockPreferences();
   return new ConfigurationPolicyProviderMac(policy_definition_list,
                                             POLICY_LEVEL_MANDATORY,
@@ skipping 86 matching lines @@
                    reinterpret_cast<const UInt8 *>(buffer),
                    arraysize(buffer)));
   ASSERT_TRUE(invalid_data);
   mandatory_prefs_->AddTestItem(name, invalid_data.get(), true);
   recommended_prefs_->AddTestItem(name, invalid_data.get(), false);
 
   // Create the provider and have it read |mandatory_prefs_|.
   mandatory_provider_.RefreshPolicies();
   recommended_provider_.RefreshPolicies();
   loop_.RunAllPending();
-  PolicyMap policy_map;
-  EXPECT_TRUE(mandatory_provider_.Provide(&policy_map));
-  EXPECT_TRUE(policy_map.empty());
-  EXPECT_TRUE(recommended_provider_.Provide(&policy_map));
-  EXPECT_TRUE(policy_map.empty());
+  const PolicyBundle kEmptyBundle;
+  EXPECT_TRUE(mandatory_provider_.policies().Equals(kEmptyBundle));
+  EXPECT_TRUE(recommended_provider_.policies().Equals(kEmptyBundle));
 }
 
 TEST_F(ConfigurationPolicyProviderMacTest, TestNonForcedValue) {
   ScopedCFTypeRef<CFStringRef> name(
       base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
   ScopedCFTypeRef<CFPropertyListRef> test_value(
       base::SysUTF8ToCFStringRef("string value"));
   ASSERT_TRUE(test_value.get());
   mandatory_prefs_->AddTestItem(name, test_value.get(), false);
   recommended_prefs_->AddTestItem(name, test_value.get(), false);
 
   // Create the provider and have it read |mandatory_prefs_|.
   mandatory_provider_.RefreshPolicies();
   recommended_provider_.RefreshPolicies();
   loop_.RunAllPending();
-  PolicyMap policy_map;
-  EXPECT_TRUE(mandatory_provider_.Provide(&policy_map));
-  EXPECT_TRUE(policy_map.empty());
-  EXPECT_TRUE(recommended_provider_.Provide(&policy_map));
-  EXPECT_EQ(1U, policy_map.size());
+  PolicyBundle expected_bundle;
+  EXPECT_TRUE(mandatory_provider_.policies().Equals(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(recommended_provider_.policies().Equals(expected_bundle));
 }
 
 TEST_F(ConfigurationPolicyProviderMacTest, TestConversions) {
   base::DictionaryValue root;
 
   // base::Value::TYPE_NULL
   root.Set("null", base::Value::CreateNullValue());
 
   // base::Value::TYPE_BOOLEAN
   root.SetBoolean("false", false);
@@ skipping 29 matching lines @@
   ScopedCFTypeRef<CFPropertyListRef> property(CreatePropertyFromValue(&root));
   ASSERT_TRUE(property);
   scoped_ptr<base::Value> value(
       MacPreferencesPolicyProviderDelegate::CreateValueFromProperty(property));
   ASSERT_TRUE(value.get());
 
   EXPECT_TRUE(root.Equals(value.get()));
 }
 
 }  // namespace policy