Provide GUID in ONC for all networks in ManagedNetworkConfigurationHandler

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 364 matching lines @@
     }
 
     // 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.
-      if (!effective_value) {
-        LOG(ERROR) << "GUID field has no effective value";
-        return nullptr;
+      if (effective_value) {
+        // DCHECK that all provided GUIDs are identical.
+        DCHECK(AllPresentValuesEqual(values, *effective_value));
+        // Return the un-augmented GUID.
+        return effective_value.Pass();
       }
-
-      // DCHECK that all provided GUIDs are identical.
-      DCHECK(AllPresentValuesEqual(values, *effective_value));
-
-      // Return the un-augmented GUID.
-      return effective_value.Pass();
+      if (values.active_setting) {
+        // Unmanaged networks have assigned (active) GUID values.
+        return make_scoped_ptr(values.active_setting->DeepCopy());
+      }
+      LOG(ERROR) << "GUID field has no effective value";
+      return nullptr;
     }
 
     scoped_ptr<base::DictionaryValue> augmented_value(
         new base::DictionaryValue);
 
     if (values.active_setting) {
       augmented_value->SetWithoutPathExpansion(
           ::onc::kAugmentationActiveSetting, values.active_setting->DeepCopy());
     }
 
@@ skipping 86 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