Refactored StringToIntEnumListPolicyHandler to be more general purpose

components/policy/core/browser/configuration_policy_handler_unittest.cc

 // Copyright (c) 2014 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/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
 #include "components/policy/core/browser/configuration_policy_handler.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/schema.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 namespace {
 
-StringToIntEnumListPolicyHandler::MappingEntry kTestTypeMap[] = {
-  { "one", 1 },
-  { "two", 2 },
-};
+void GetIntegerTypeMap(
+    ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "one", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(1))));
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "two", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(2))));

[Joao da Silva, 2014/06/18 08:45:26]

CreateIntegerValue() is deprecated, use new base::FundamentalValue(n) instead

+}
 
 const char kTestPolicy[] = "unit_test.test_policy";
 const char kTestPref[] = "unit_test.test_pref";
 
 class TestSchemaValidatingPolicyHandler : public SchemaValidatingPolicyHandler {
  public:
   TestSchemaValidatingPolicyHandler(const Schema& schema,
                                     SchemaOnErrorStrategy strategy)
       : SchemaValidatingPolicyHandler("PolicyForTesting", schema, strategy) {}
   virtual ~TestSchemaValidatingPolicyHandler() {}
 
   virtual void ApplyPolicySettings(const policy::PolicyMap&,
                                    PrefValueMap*) OVERRIDE {
   }
 
   bool CheckAndGetValueForTest(const PolicyMap& policies,
                                scoped_ptr<base::Value>* value) {
     return SchemaValidatingPolicyHandler::CheckAndGetValue(
         policies, NULL, value);
   }
 };
 
 }  // namespace
 
 TEST(StringToIntEnumListPolicyHandlerTest, CheckPolicySettings) {
   base::ListValue list;
   PolicyMap policy_map;
   PolicyErrorMap errors;
-  StringToIntEnumListPolicyHandler handler(
+  StringMappingListPolicyHandler handler(
       kTestPolicy,
       kTestPref,
-      kTestTypeMap,
-      kTestTypeMap + arraysize(kTestTypeMap));
+      base::Bind(GetIntegerTypeMap));
 
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy(), NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.AppendString("one");
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy(), NULL);
@@ skipping 11 matching lines @@
 
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER,
                  base::Value::CreateStringValue("no list"), NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
   EXPECT_FALSE(errors.GetErrors(kTestPolicy).empty());
 }
 
-TEST(StringToIntEnumListPolicyHandlerTest, ApplyPolicySettings) {
+TEST(StringMappingListPolicyHandlerTest, ApplyPolicySettings) {
   base::ListValue list;
   base::ListValue expected;
   PolicyMap policy_map;
   PrefValueMap prefs;
   base::Value* value;
-  StringToIntEnumListPolicyHandler handler(
+  StringMappingListPolicyHandler handler(
       kTestPolicy,
       kTestPref,
-      kTestTypeMap,
-      kTestTypeMap + arraysize(kTestTypeMap));
+      base::Bind(GetIntegerTypeMap));
 
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy(), NULL);
   handler.ApplyPolicySettings(policy_map, &prefs);
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(&expected, value));
 
   list.AppendString("two");
   expected.AppendInteger(2);
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
@@ skipping 578 matching lines @@
   handler_recommended.ApplyPolicySettings(policy_map_mandatory, &prefs);
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value_set_in_pref));
   EXPECT_TRUE(value_expected_in_pref->Equals(value_set_in_pref));
 
   EXPECT_FALSE(
       handler_none.CheckPolicySettings(policy_map_recommended, &errors));
   EXPECT_FALSE(errors.empty());
 }
 
 }  // namespace policy