ONC: Add IPAddressConfigType and NameServersConfigType

chromeos/network/onc/onc_merger.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_merger.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 351 matching lines @@
       const std::string& key,
       const ValueParams& values) override {
     const OncFieldSignature* field = NULL;
     if (signature_)
       field = GetFieldSignature(*signature_, key);
 
     if (!field) {
       // 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
     // controlled by policy.
     std::string which_effective;
     scoped_ptr<base::Value> effective_value =
         MergeToEffective::MergeValues(key, values, &which_effective);
 
     if (IsIdentifierField(*signature_, key)) {
       // Don't augment the GUID but write the plain value.
@@ skipping 106 matching lines @@
     const base::DictionaryValue* shared_settings,
     const base::DictionaryValue* active_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       signature, user_policy, device_policy, user_settings, shared_settings,
       active_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos