Provide GUID in ONC for all networks in ManagedNetworkConfigurationHandler

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 c2af97e800e4945b82ce4f232695b8a36d5ad5f0..285e5c2587bb5e098cc6ea63ef6732af90dfce5c 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -383,8 +383,13 @@ class MergeToAugmented : public MergeToEffective {
     if (IsIdentifierField(*signature_, key)) {
       // Don't augment the GUID but write the plain value.
       if (!effective_value) {

[pneubeck (no reviews), 2015/01/14 17:47:10]

please simplify/flatten the logic here:


if (effective_value) {
  // DCHECK that all provided GUIDs are identical.
  DCHECK(AllPresentValuesEqual(values, *effective_value));

  // Return the un-augmented GUID.
  return effective_value.Pass();
} else if (values.active_setting) {
  // Unmanaged networks have assigned (active) GUID values.
  return make_scoped_ptr(values.active_setting->DeepCopy());
} else {
  LOG(ERROR) << "GUID field has no effective or active value.";
  return nullptr;
}

[stevenjb, 2015/01/14 18:07:44]

Done (without the else's)

[pneubeck (no reviews), 2015/01/15 09:45:12]

i think you didn't upload the latest patch set.

-        LOG(ERROR) << "GUID field has no effective value";
-        return nullptr;
+        if (values.active_setting) {
+          // Unmanaged networks have assigned (active) GUID values.
+          effective_value.reset(values.active_setting->DeepCopy());
+        } else {
+          LOG(ERROR) << "GUID field has no effective value";
+          return nullptr;
+        }
       }
 
       // DCHECK that all provided GUIDs are identical.