Provide GUID in ONC for all networks in ManagedNetworkConfigurationHandler

chromeos/dbus/fake_shill_service_client.cc

 // Copyright 2013 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/dbus/fake_shill_service_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 414 matching lines @@
     // from Shill. Properties that start with "Provider" need to have that
     // stripped off, other properties are nested in the "Provider" dictionary
     // as-is.
     std::string key = property;
     if (StartsWithASCII(property, "Provider.", case_sensitive))
       key = property.substr(strlen("Provider."));
     base::DictionaryValue* provider = new base::DictionaryValue;
     provider->SetWithoutPathExpansion(key, value.DeepCopy());
     new_properties.SetWithoutPathExpansion(shill::kProviderProperty, provider);
     changed_property = shill::kProviderProperty;
+  } else if (value.GetType() == base::Value::TYPE_DICTIONARY) {
+    const base::DictionaryValue* new_dict = NULL;
+    value.GetAsDictionary(&new_dict);
+    CHECK(new_dict);
+    scoped_ptr<base::Value> cur_value;
+    base::DictionaryValue* cur_dict;
+    if (dict->RemoveWithoutPathExpansion(property, &cur_value) &&
+        cur_value->GetAsDictionary(&cur_dict)) {
+      cur_dict->Clear();
+      cur_dict->MergeDictionary(new_dict);
+      new_properties.SetWithoutPathExpansion(property, cur_value.release());
+    } else {
+      new_properties.SetWithoutPathExpansion(property, value.DeepCopy());
+    }
+    changed_property = property;
   } else {
     new_properties.SetWithoutPathExpansion(property, value.DeepCopy());
     changed_property = property;
   }
 
   dict->MergeDictionary(&new_properties);
 
   // Add or update the profile entry.
   ShillProfileClient::TestInterface* profile_test =
       DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface();
@@ skipping 183 matching lines @@
   } else {
     // Set Online.
     VLOG(1) << "Setting state to Online " << service_path;
     SetServiceProperty(service_path,
                        shill::kStateProperty,
                        base::StringValue(shill::kStateOnline));
   }
 }
 
 }  // namespace chromeos