Add MacAddress to ONC and networkingPrivate

chromeos/network/network_util.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/network_util.h"
 
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/network/favorite_state.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "chromeos/network/shill_property_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
@@ skipping 74 matching lines @@
       // mask is not a valid number.
       return -1;
     }
     count++;
   }
   if (count < 4)
     return -1;
   return prefix_length;
 }
 
+std::string FormattedMacAddress(const std::string& shill_mac_address) {
+  if (shill_mac_address.size() % 2 != 0)
+    return shill_mac_address;
+  std::string result;
+  for (size_t i = 0; i < shill_mac_address.size(); ++i) {
+    if ((i != 0) && (i % 2 == 0))
+      result.push_back(':');
+    result.push_back(base::ToUpperASCII(shill_mac_address[i]));
+  }
+  return result;
+}
+
 bool ParseCellularScanResults(const base::ListValue& list,
                               std::vector<CellularScanResult>* scan_results) {
   scan_results->clear();
   scan_results->reserve(list.GetSize());
   for (base::ListValue::const_iterator it = list.begin();
        it != list.end(); ++it) {
     if (!(*it)->IsType(base::Value::TYPE_DICTIONARY))
       return false;
     CellularScanResult scan_result;
     const base::DictionaryValue* dict =
@@ skipping 54 matching lines @@
        ++it) {
     scoped_ptr<base::DictionaryValue> onc_dictionary =
         TranslateFavoriteStateToONC(*it);
     network_properties_list->Append(onc_dictionary.release());
   }
   return network_properties_list.Pass();
 }
 
 }  // namespace network_util
 }  // namespace chromeos