Index: device/bluetooth/bluetooth_device.cc |
diff --git a/device/bluetooth/bluetooth_device.cc b/device/bluetooth/bluetooth_device.cc |
index d9ba2134684e0cada56cb8afda0ca13afd66e3e7..7c100ec71d5330e0842cab531f24aae02c3008c4 100644 |
--- a/device/bluetooth/bluetooth_device.cc |
+++ b/device/bluetooth/bluetooth_device.cc |
@@ -27,14 +27,14 @@ BluetoothDevice::~BluetoothDevice() { |
base::string16 BluetoothDevice::GetName() const { |
std::string name = GetDeviceName(); |
if (!name.empty()) { |
- return UTF8ToUTF16(name); |
+ return base::UTF8ToUTF16(name); |
} else { |
return GetAddressWithLocalizedDeviceTypeName(); |
} |
} |
base::string16 BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() const { |
- base::string16 address_utf16 = UTF8ToUTF16(GetAddress()); |
+ base::string16 address_utf16 = base::UTF8ToUTF16(GetAddress()); |
BluetoothDevice::DeviceType device_type = GetDeviceType(); |
switch (device_type) { |
case DEVICE_COMPUTER: |