Removed the PolicyDefinitionList from the ConfigurationPolicyProvider interface.

Also deleted some files left behind when the linux and mac providers were refactored.

BUG=130918
TEST=nothing breaks


Review URL: https://chromiumcodereview.appspot.com/10545033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141008 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 248 deletions

diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
deleted file mode 100644
index 84ce467..0000000
--- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-// 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 "base/compiler_specific.h"
-#include "base/file_util.h"
-#include "base/json/json_string_value_serializer.h"
-#include "base/message_loop.h"
-#include "base/scoped_temp_dir.h"
-#include "base/string_number_conversions.h"
-#include "base/values.h"
-#include "chrome/browser/policy/config_dir_policy_provider.h"
-#include "chrome/browser/policy/configuration_policy_provider_test.h"
-#include "chrome/browser/policy/policy_bundle.h"
-#include "chrome/browser/policy/policy_map.h"
-
-namespace policy {
-
-namespace {
-
-class TestHarness : public PolicyProviderTestHarness {
- public:
-  TestHarness();
-  virtual ~TestHarness();
-
-  virtual void SetUp() OVERRIDE;
-
-  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(
-      const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
-  virtual void InstallDictionaryPolicy(
-      const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
-
-  const FilePath& test_dir() { return test_dir_.path(); }
-
-  // JSON-encode a dictionary and write it to a file.
-  void WriteConfigFile(const base::DictionaryValue& dict,
-                       const std::string& file_name);
-
-  static PolicyProviderTestHarness* Create();
-
- private:
-  ScopedTempDir test_dir_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestHarness);
-};
-
-TestHarness::TestHarness()
-    : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE) {}
-
-TestHarness::~TestHarness() {}
-
-void TestHarness::SetUp() {
-  ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
-}
-
-ConfigurationPolicyProvider* TestHarness::CreateProvider(
-    const PolicyDefinitionList* policy_definition_list) {
-  return new ConfigDirPolicyProvider(policy_definition_list,
-                                     POLICY_LEVEL_MANDATORY,
-                                     POLICY_SCOPE_MACHINE,
-                                     test_dir());
-}
-
-void TestHarness::InstallEmptyPolicy() {
-  base::DictionaryValue dict;
-  WriteConfigFile(dict, "policy");
-}
-
-void TestHarness::InstallStringPolicy(const std::string& policy_name,
-                                      const std::string& policy_value) {
-  base::DictionaryValue dict;
-  dict.SetString(policy_name, policy_value);
-  WriteConfigFile(dict, "policy");
-}
-
-void TestHarness::InstallIntegerPolicy(const std::string& policy_name,
-                                       int policy_value) {
-  base::DictionaryValue dict;
-  dict.SetInteger(policy_name, policy_value);
-  WriteConfigFile(dict, "policy");
-}
-
-void TestHarness::InstallBooleanPolicy(const std::string& policy_name,
-                                       bool policy_value) {
-  base::DictionaryValue dict;
-  dict.SetBoolean(policy_name, policy_value);
-  WriteConfigFile(dict, "policy");
-}
-
-void TestHarness::InstallStringListPolicy(const std::string& policy_name,
-                                          const base::ListValue* policy_value) {
-  base::DictionaryValue dict;
-  dict.Set(policy_name, policy_value->DeepCopy());
-  WriteConfigFile(dict, "policy");
-}
-
-void TestHarness::InstallDictionaryPolicy(
-    const std::string& policy_name,
-    const base::DictionaryValue* policy_value) {
-  base::DictionaryValue dict;
-  dict.Set(policy_name, policy_value->DeepCopy());
-  WriteConfigFile(dict, "policy");
-}
-
-void TestHarness::WriteConfigFile(const base::DictionaryValue& dict,
-                                  const std::string& file_name) {
-  std::string data;
-  JSONStringValueSerializer serializer(&data);
-  serializer.Serialize(dict);
-  const FilePath file_path(test_dir().AppendASCII(file_name));
-  ASSERT_TRUE(file_util::WriteFile(file_path, data.c_str(), data.size()));
-}
-
-// static
-PolicyProviderTestHarness* TestHarness::Create() {
-  return new TestHarness();
-}
-
-}  // namespace
-
-// Instantiate abstract test case for basic policy reading tests.
-INSTANTIATE_TEST_CASE_P(
-    ConfigDirPolicyProviderTest,
-    ConfigurationPolicyProviderTest,
-    testing::Values(TestHarness::Create));
-
-// Some tests that exercise special functionality in ConfigDirPolicyLoader.
-class ConfigDirPolicyLoaderTest : public testing::Test {
- protected:
-  void SetUp() {
-    harness_.SetUp();
-  }
-
-  TestHarness harness_;
-};
-
-// The preferences dictionary is expected to be empty when there are no files to
-// load.
-TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsEmpty) {
-  ConfigDirPolicyProviderDelegate loader(harness_.test_dir(),
-                                         POLICY_LEVEL_MANDATORY,
-                                         POLICY_SCOPE_MACHINE);
-  scoped_ptr<PolicyBundle> bundle(loader.Load());
-  ASSERT_TRUE(bundle.get());
-  const PolicyBundle kEmptyBundle;
-  EXPECT_TRUE(bundle->Equals(kEmptyBundle));
-}
-
-// Reading from a non-existent directory should result in an empty preferences
-// dictionary.
-TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsNonExistentDirectory) {
-  FilePath non_existent_dir(
-      harness_.test_dir().Append(FILE_PATH_LITERAL("not_there")));
-  ConfigDirPolicyProviderDelegate loader(non_existent_dir,
-                                         POLICY_LEVEL_MANDATORY,
-                                         POLICY_SCOPE_MACHINE);
-  scoped_ptr<PolicyBundle> bundle(loader.Load());
-  ASSERT_TRUE(bundle.get());
-  const PolicyBundle kEmptyBundle;
-  EXPECT_TRUE(bundle->Equals(kEmptyBundle));
-}
-
-// Test merging values from different files.
-TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsMergePrefs) {
-  // Write a bunch of data files in order to increase the chance to detect the
-  // provider not respecting lexicographic ordering when reading them. Since the
-  // filesystem may return files in arbitrary order, there is no way to be sure,
-  // but this is better than nothing.
-  base::DictionaryValue test_dict_bar;
-  test_dict_bar.SetString("HomepageLocation", "http://bar.com");
-  for (unsigned int i = 1; i <= 4; ++i)
-    harness_.WriteConfigFile(test_dict_bar, base::IntToString(i));
-  base::DictionaryValue test_dict_foo;
-  test_dict_foo.SetString("HomepageLocation", "http://foo.com");
-  harness_.WriteConfigFile(test_dict_foo, "9");
-  for (unsigned int i = 5; i <= 8; ++i)
-    harness_.WriteConfigFile(test_dict_bar, base::IntToString(i));
-
-  ConfigDirPolicyProviderDelegate loader(harness_.test_dir(),
-                                         POLICY_LEVEL_MANDATORY,
-                                         POLICY_SCOPE_USER);
-  scoped_ptr<PolicyBundle> bundle(loader.Load());
-  ASSERT_TRUE(bundle.get());
-  PolicyBundle expected_bundle;
-  expected_bundle.Get(POLICY_DOMAIN_CHROME, "")
-      .LoadFrom(&test_dict_foo, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER);
-  EXPECT_TRUE(bundle->Equals(expected_bundle));
-}
-
-// Tests loading of policy for 3rd parties.
-TEST_F(ConfigDirPolicyLoaderTest, Load3rdParty) {
-  base::DictionaryValue policy_dict;
-  policy_dict.SetBoolean("bool", true);
-  policy_dict.SetString("str", "string value");
-  policy_dict.SetDouble("double", 123.456);
-  policy_dict.SetInteger("int", 789);
-
-  base::ListValue* list = new base::ListValue();
-  for (int i = 0; i < 5; ++i) {
-    base::DictionaryValue* dict = new base::DictionaryValue();
-    dict->SetInteger("subdictindex", i);
-    dict->Set("subdict", policy_dict.DeepCopy());
-    list->Append(dict);
-  }
-  policy_dict.Set("list", list);
-
-  base::DictionaryValue json_dict;
-  // Merge |policy_dict|, which will become the chrome policies.
-  json_dict.MergeDictionary(&policy_dict);
-  json_dict.Set("3rdparty.extensions.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                policy_dict.DeepCopy());
-  json_dict.Set("3rdparty.extensions.bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-                policy_dict.DeepCopy());
-
-  harness_.WriteConfigFile(json_dict, "policy.json");
-  ConfigDirPolicyProviderDelegate loader(harness_.test_dir(),
-                                         POLICY_LEVEL_MANDATORY,
-                                         POLICY_SCOPE_USER);
-  scoped_ptr<PolicyBundle> bundle(loader.Load());
-  ASSERT_TRUE(bundle.get());
-  PolicyMap expected_policy;
-  expected_policy.LoadFrom(&policy_dict,
-                           POLICY_LEVEL_MANDATORY,
-                           POLICY_SCOPE_USER);
-  PolicyBundle expected_bundle;
-  expected_bundle.Get(POLICY_DOMAIN_CHROME, "").CopyFrom(expected_policy);
-  expected_bundle.Get(POLICY_DOMAIN_EXTENSIONS,
-                      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
-                          .CopyFrom(expected_policy);
-  expected_bundle.Get(POLICY_DOMAIN_EXTENSIONS,
-                      "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
-                          .CopyFrom(expected_policy);
-  EXPECT_TRUE(bundle->Equals(expected_bundle));
-}
-
-}  // namespace policy