Removed the PolicyDefinitionList.

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/callback.h"
 #include "base/files/file_path.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/async_policy_provider.h"
 #include "chrome/browser/policy/configuration_policy_provider_test.h"
 #include "chrome/browser/policy/external_data_fetcher.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/policy/preferences_mock_mac.h"
 #include "policy/policy_constants.h"

[bartfab (slow), 2013/11/05 18:18:33]

Nit: Is this still used?

[Joao da Silva, 2013/11/07 20:27:27]

Good catch, removed

 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ScopedCFTypeRef;
 
 namespace policy {
 
 namespace {
 
 // Converts a base::Value to the equivalent CFPropertyListRef.
 // The returned value is owned by the caller.
@@ skipping 90 matching lines @@
 
 class TestHarness : public PolicyProviderTestHarness {
  public:
   TestHarness();
   virtual ~TestHarness();
 
   virtual void SetUp() OVERRIDE;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner,
-      const PolicyDefinitionList* policy_definition_list) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) 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(
       const std::string& policy_name,
@@ skipping 12 matching lines @@
 
 TestHarness::TestHarness()
     : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER) {}
 
 TestHarness::~TestHarness() {}
 
 void TestHarness::SetUp() {}
 
 ConfigurationPolicyProvider* TestHarness::CreateProvider(
     SchemaRegistry* registry,
-    scoped_refptr<base::SequencedTaskRunner> task_runner,
-    const PolicyDefinitionList* policy_definition_list) {
+    scoped_refptr<base::SequencedTaskRunner> task_runner) {
   prefs_ = new MockPreferences();
-  scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
-      task_runner, policy_definition_list, base::FilePath(), prefs_));
+  scoped_ptr<AsyncPolicyLoader> loader(
+      new PolicyLoaderMac(task_runner, base::FilePath(), prefs_));
   return new AsyncPolicyProvider(registry, 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 52 matching lines @@
 
 // Special test cases for some mac preferences details.
 class PolicyLoaderMacTest : public PolicyTestBase {
  protected:
   PolicyLoaderMacTest()
       : prefs_(new MockPreferences()) {}
   virtual ~PolicyLoaderMacTest() {}
 
   virtual void SetUp() OVERRIDE {
     PolicyTestBase::SetUp();
-    scoped_ptr<AsyncPolicyLoader> loader(
-        new PolicyLoaderMac(loop_.message_loop_proxy(),
-                            &test_policy_definitions::kList,
-                            base::FilePath(),
-                            prefs_));
+    scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
+        loop_.message_loop_proxy(), base::FilePath(), prefs_));
     provider_.reset(new AsyncPolicyProvider(&schema_registry_, loader.Pass()));
     provider_->Init(&schema_registry_);
   }
 
   virtual void TearDown() OVERRIDE {
     provider_->Shutdown();
     PolicyTestBase::TearDown();
   }
 
   MockPreferences* prefs_;
   scoped_ptr<AsyncPolicyProvider> provider_;
 };
 
 TEST_F(PolicyLoaderMacTest, Invalid) {
   ScopedCFTypeRef<CFStringRef> name(
-      base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
+      base::SysUTF8ToCFStringRef(test_keys::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_.RunUntilIdle();
   const PolicyBundle kEmptyBundle;
   EXPECT_TRUE(provider_->policies().Equals(kEmptyBundle));
 }
 
 TEST_F(PolicyLoaderMacTest, TestNonForcedValue) {
   ScopedCFTypeRef<CFStringRef> name(
-      base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
+      base::SysUTF8ToCFStringRef(test_keys::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_.RunUntilIdle();
   PolicyBundle expected_bundle;
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
-      .Set(test_policy_definitions::kKeyString,
+      .Set(test_keys::kKeyString,
            POLICY_LEVEL_RECOMMENDED,
            POLICY_SCOPE_USER,
            base::Value::CreateStringValue("string value"),
            NULL);
   EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
 }
 
 TEST_F(PolicyLoaderMacTest, TestConversions) {
   base::DictionaryValue root;
 
@@ skipping 34 matching lines @@
   ScopedCFTypeRef<CFPropertyListRef> property(CreatePropertyFromValue(&root));
   ASSERT_TRUE(property);
   scoped_ptr<base::Value> value(
       PolicyLoaderMac::CreateValueFromProperty(property));
   ASSERT_TRUE(value.get());
 
   EXPECT_TRUE(root.Equals(value.get()));
 }
 
 }  // namespace policy