Extending ONC validator's logging. Completing toplevel validation.

chromeos/network/onc/onc_normalizer.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 "chromeos/network/onc/onc_normalizer.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_signature.h"
 
 namespace chromeos {
 namespace onc {
 
 Normalizer::Normalizer(bool remove_recommended_fields)
     : remove_recommended_fields_(remove_recommended_fields) {
 }
 
 Normalizer::~Normalizer() {
 }
 
 scoped_ptr<base::DictionaryValue> Normalizer::NormalizeObject(
     const OncValueSignature* object_signature,
     const base::DictionaryValue& onc_object) {
   CHECK(object_signature != NULL);
-  return MapObject(*object_signature, onc_object);
+  bool error = false;
+  scoped_ptr<base::DictionaryValue> result =
+      MapObject(*object_signature, onc_object, &error);
+  DCHECK(!error);
+  return result.Pass();
 }
 
 scoped_ptr<base::DictionaryValue> Normalizer::MapObject(
     const OncValueSignature& signature,
-    const base::DictionaryValue& onc_object) {
+    const base::DictionaryValue& onc_object,
+    bool* error) {
   scoped_ptr<base::DictionaryValue> normalized =
-      Mapper::MapObject(signature, onc_object);
+      Mapper::MapObject(signature, onc_object, error);
 
   if (normalized.get() == NULL)
     return scoped_ptr<base::DictionaryValue>();
 
   if (remove_recommended_fields_)
     normalized->RemoveWithoutPathExpansion(kRecommended, NULL);
 
   if (&signature == &kNetworkConfigurationSignature)
     NormalizeNetworkConfiguration(normalized.get());
   else if (&signature == &kVPNSignature)
@@ skipping 49 matching lines @@
 void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
   std::string type;
   network->GetStringWithoutPathExpansion(kType, &type);
   RemoveEntryUnless(network, kEthernet, type == kEthernet);
   RemoveEntryUnless(network, kVPN, type == kVPN);
   RemoveEntryUnless(network, kWiFi, type == kWiFi);
 }
 
 }  // namespace onc
 }  // namespace chromeos