ONC: Add IPAddressConfigType and NameServersConfigType

chromeos/network/onc/onc_merger.cc

Index: chromeos/network/onc/onc_merger.cc
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 32efb0f3056a3ab68577dfb8794d4b7eba77621b..c2af97e800e4945b82ce4f232695b8a36d5ad5f0 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -369,7 +369,9 @@ class MergeToAugmented : public MergeToEffective {
       // This field is not part of the provided ONCSignature, thus it cannot be
       // controlled by policy. Return the plain active value instead of an
       // augmented dictionary.
-      return make_scoped_ptr(values.active_setting->DeepCopy());
+      if (values.active_setting)
+        return make_scoped_ptr(values.active_setting->DeepCopy());
+      return nullptr;
     }
 
     // This field is part of the provided ONCSignature, thus it can be