summaryrefslogtreecommitdiffstats
path: root/chromeos/network/onc/onc_normalizer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos/network/onc/onc_normalizer.cc')
-rw-r--r--chromeos/network/onc/onc_normalizer.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/chromeos/network/onc/onc_normalizer.cc b/chromeos/network/onc/onc_normalizer.cc
index 4f99867..a1f1743 100644
--- a/chromeos/network/onc/onc_normalizer.cc
+++ b/chromeos/network/onc/onc_normalizer.cc
@@ -25,14 +25,19 @@ 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>();