[Bluetooth] Standardize Bluetooth device address format to XX:XX:XX:XX:XX:XX.

device/bluetooth/bluetooth_device_mac.mm

 // 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 "device/bluetooth/bluetooth_device_mac.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash.h"
@@ skipping 234 matching lines @@
                                               inType:power_level_type
                                outTransmitPowerLevel:&power_level];
   if (result != kIOReturnSuccess)
     return kUnknownPower;
 
   return power_level;
 }
 
 // static
 std::string BluetoothDeviceMac::GetDeviceAddress(IOBluetoothDevice* device) {
-  return NormalizeAddress(base::SysNSStringToUTF8([device addressString]));
-}
-
-// static
-std::string BluetoothDeviceMac::NormalizeAddress(const std::string& address) {
-  std::string normalized;
-  base::ReplaceChars(address, "-", ":", &normalized);
-  // TODO(isherman): Restore StringToUpperASCII(&normalized) call for M37.
-  // http://crbug.com/371014
-  return normalized;
+  return CanonicalizeAddress(base::SysNSStringToUTF8([device addressString]));
 }
 
 }  // namespace device