summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device.cc
diff options
context:
space:
mode:
Diffstat (limited to 'device/bluetooth/bluetooth_device.cc')
-rw-r--r--device/bluetooth/bluetooth_device.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/device/bluetooth/bluetooth_device.cc b/device/bluetooth/bluetooth_device.cc
index d9ba2134..7c100ec 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: