Add MacAddress to ONC and networkingPrivate

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 144 matching lines @@
       NOTREACHED();
   } else if (profile) {
     NET_LOG_ERROR("Service contains empty or invalid UIData", service_path);
     // TODO(pneubeck): add a conversion of user configured entries of old
     // ChromeOS versions. We will have to use a heuristic to determine which
     // properties _might_ be user configured.
   }
 
   scoped_ptr<base::DictionaryValue> properties_copy(
       shill_properties.DeepCopy());
-  // Add the IPConfigs to the dictionary before the ONC translation.
-  GetIPConfigs(service_path, properties_copy.get());
+  // Add associated Device properties before the ONC translation.
+  GetDeviceProperties(service_path, properties_copy.get());
 
   scoped_ptr<base::DictionaryValue> active_settings(
       onc::TranslateShillServiceToONCPart(
           *properties_copy,
           &onc::kNetworkWithStateSignature));
 
   std::string guid;
   active_settings->GetStringWithoutPathExpansion(::onc::network_config::kGUID,
                                                  &guid);
 
@@ skipping 39 matching lines @@
                  callback),
       error_callback);
 }
 
 void ManagedNetworkConfigurationHandlerImpl::GetPropertiesCallback(
     const network_handler::DictionaryResultCallback& callback,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
   scoped_ptr<base::DictionaryValue> properties_copy(
       shill_properties.DeepCopy());
-  // Add the IPConfigs to the dictionary before the ONC translation.
-  GetIPConfigs(service_path, properties_copy.get());
+  // Add associated Device properties before the ONC translation.
+  GetDeviceProperties(service_path, properties_copy.get());
 
   scoped_ptr<base::DictionaryValue> onc_network(
       onc::TranslateShillServiceToONCPart(
           *properties_copy,
           &onc::kNetworkWithStateSignature));
   callback.Run(service_path, *onc_network);
 }
 
 void ManagedNetworkConfigurationHandlerImpl::SetProperties(
     const std::string& service_path,
@@ skipping 368 matching lines @@
 }
 
 void ManagedNetworkConfigurationHandlerImpl::OnPolicyAppliedToNetwork(
     const std::string& service_path) {
   if (service_path.empty())
     return;
   FOR_EACH_OBSERVER(
       NetworkPolicyObserver, observers_, PolicyApplied(service_path));
 }
 
-void ManagedNetworkConfigurationHandlerImpl::GetIPConfigs(
+void ManagedNetworkConfigurationHandlerImpl::GetDeviceProperties(
     const std::string& service_path,
     base::DictionaryValue* properties) {
   std::string connection_state;
   properties->GetStringWithoutPathExpansion(
       shill::kStateProperty, &connection_state);
   if (!NetworkState::StateIsConnected(connection_state))
     return;
 
   // Get the IPConfig properties from the device and store them in "IPConfigs"
   // (plural) in the properties dictionary. (Note: Shill only provides a single
   // "IPConfig" property for a network service, but a consumer of this API may
   // want information about all ipv4 and ipv6 IPConfig properties.
   std::string device;
   properties->GetStringWithoutPathExpansion(shill::kDeviceProperty, &device);
   const DeviceState* device_state =
       network_state_handler_->GetDeviceState(device);
   if (!device_state) {
-    NET_LOG_ERROR("GetIPConfigs: no device: " + device, service_path);
+    NET_LOG_ERROR("GetDeviceProperties: no device: " + device, service_path);
     return;
   }
+
+  // Get the hardware MAC address from the DeviceState.
+  if (!device_state->mac_address().empty()) {
+    properties->SetStringWithoutPathExpansion(
+        shill::kAddressProperty, device_state->mac_address());
+  }
+
   // Convert IPConfig dictionary to a ListValue.
   base::ListValue* ip_configs = new base::ListValue;
   for (base::DictionaryValue::Iterator iter(device_state->ip_configs());
        !iter.IsAtEnd(); iter.Advance()) {
     ip_configs->Append(iter.value().DeepCopy());
   }
   properties->SetWithoutPathExpansion(shill::kIPConfigsProperty, ip_configs);
 }
 
 }  // namespace chromeos