Added a SchemaMap.

chrome/browser/policy/policy_domain_descriptor.cc

 // Copyright (c) 2013 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 "chrome/browser/policy/policy_domain_descriptor.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_map.h"
 
 namespace policy {
 
-namespace {
-
-bool Matches(Schema schema, const base::Value& value) {
-  if (!schema.valid()) {
-    // Schema not found, invalid entry.
-    return false;
-  }
-
-  if (!value.IsType(schema.type()))
-    return false;
-
-  const base::DictionaryValue* dict = NULL;
-  const base::ListValue* list = NULL;
-  if (value.GetAsDictionary(&dict)) {
-    for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
-         it.Advance()) {
-      if (!Matches(schema.GetProperty(it.key()), it.value()))
-        return false;
-    }
-  } else if (value.GetAsList(&list)) {
-    for (base::ListValue::const_iterator it = list->begin();
-         it != list->end(); ++it) {
-      if (!*it || !Matches(schema.GetItems(), **it))
-        return false;
-    }
-  }
-
-  return true;
-}
-
-}  // namespace
-
 PolicyDomainDescriptor::PolicyDomainDescriptor(PolicyDomain domain)
     : domain_(domain) {}
 
 void PolicyDomainDescriptor::RegisterComponent(const std::string& component_id,
                                                Schema schema) {
   schema_map_[component_id] = schema;
 }
 
 void PolicyDomainDescriptor::FilterBundle(PolicyBundle* bundle) const {
   // Chrome policies are not filtered, so that typos appear in about:policy.
@@ skipping 20 matching lines @@
     if (!schema.valid())
       continue;
 
     PolicyMap* map = it_bundle->second;
     for (PolicyMap::const_iterator it_map = map->begin();
          it_map != map->end();) {
       const std::string& policy_name = it_map->first;
       const base::Value* policy_value = it_map->second.value;
       Schema policy_schema = schema.GetProperty(policy_name);
       ++it_map;
-      if (!policy_value || !Matches(policy_schema, *policy_value))
+      if (!policy_value || !policy_schema.Validate(*policy_value))
         map->Erase(policy_name);
     }
   }
 }
 
 PolicyDomainDescriptor::~PolicyDomainDescriptor() {}
 
 }  // namespace policy