Add strictness to Schema::Validate()

components/policy/core/common/schema_map.cc

 // Copyright 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 "components/policy/core/common/schema_map.h"
 
+#include "base/logging.h"
 #include "base/values.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
 
 namespace policy {
 
 SchemaMap::SchemaMap() {}
 
 SchemaMap::SchemaMap(DomainMap& map) {
   map_.swap(map);
@@ skipping 39 matching lines @@
     if (!schema->valid())
       continue;
 
     PolicyMap* map = it->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 || !policy_schema.Validate(*policy_value))
+      std::string error;
+      if (!policy_value || !policy_schema.Validate(*policy_value,
+          SCHEMA_STRICT, &error)) {

[Joao da Silva, 2014/01/23 15:52:36]

Try formatting this line with clang-format:

      if (!policy_value ||
          !policy_schema.Validate(*policy_value, SCHEMA_STRICT, &error)) {
        ...
      }

[binjin, 2014/01/23 17:20:13]

Done.

+        LOG(ERROR) << "Dropping policy " << policy_name << " for " <<
+            it->first.component_id << " because it's not valid: " << error;

[Joao da Silva, 2014/01/23 15:52:36]

Run clang-format on this one too; I didn't format it in my previous comment.

[binjin, 2014/01/23 17:20:13]

Done.

         map->Erase(policy_name);
+      }
     }
   }
 }
 
 bool SchemaMap::HasComponents() const {
   for (DomainMap::const_iterator domain = map_.begin();
        domain != map_.end(); ++domain) {
     if (domain->first == POLICY_DOMAIN_CHROME)
       continue;
     if (!domain->second.empty())
@@ skipping 18 matching lines @@
     for (ComponentMap::const_iterator comp = components.begin();
          comp != components.end(); ++comp) {
       PolicyNamespace ns(domain->first, comp->first);
       if (!other->GetSchema(ns))
         list->push_back(ns);
     }
   }
 }
 
 }  // namespace policy