Provide GUID in ONC for all networks in ManagedNetworkConfigurationHandler

chromeos/network/managed_network_configuration_handler_impl.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/network/managed_network_configuration_handler_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 721 matching lines @@
   properties->SetWithoutPathExpansion(shill::kIPConfigsProperty, ip_configs);
 }
 
 void ManagedNetworkConfigurationHandlerImpl::GetPropertiesCallback(
     GetDevicePropertiesCallback send_callback,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
   scoped_ptr<base::DictionaryValue> shill_properties_copy(
       shill_properties.DeepCopy());
 
+  std::string guid;
+  shill_properties.GetStringWithoutPathExpansion(shill::kGuidProperty, &guid);
+  if (guid.empty()) {
+    // Unmanaged networks are assigned a GUID in NetworkState. Provide this
+    // value in the ONC dictionary.
+    const NetworkState* state =
+        network_state_handler_->GetNetworkState(service_path);
+    if (state && !state->guid().empty()) {
+      guid = state->guid();

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

nit: inlining this is clearer as the original value (empty guid from
shill_properties) is never used

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

I'm not sure I agree. Currently guid is unused, but it is easy to imagine code
down the road using guid since it is scoped outside of the if() (and would be
awkward to scope, I played with doing that).

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

sounds ok.

+      shill_properties_copy->SetStringWithoutPathExpansion(shill::kGuidProperty,
+                                                           guid);
+    } else {
+      LOG(ERROR) << "Network has no GUID specified: " << service_path;
+    }
+  }
+
+
   std::string type;
   shill_properties_copy->GetStringWithoutPathExpansion(shill::kTypeProperty,
                                                        &type);
   // Add associated DeviceState properties for non-VPN networks.
   if (type != shill::kTypeVPN)
     GetDeviceStateProperties(service_path, shill_properties_copy.get());
 
   // Only request additional Device properties for Cellular networks with a
   // valid device.
   std::string device_path;
@@ skipping 43 matching lines @@
     scoped_ptr<base::DictionaryValue> network_properties,
     GetDevicePropertiesCallback send_callback,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Error getting device properties", service_path);
   send_callback.Run(service_path, network_properties.Pass());
 }
 
 
 }  // namespace chromeos