Index: components/arc/bluetooth/arc_bluetooth_bridge.cc |
diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.cc b/components/arc/bluetooth/arc_bluetooth_bridge.cc |
index ce593d7a5751760db19f3154595da4ee98f24bdf..4acf4b21cd1a565e6beca8949c8836d968a7322f 100644 |
--- a/components/arc/bluetooth/arc_bluetooth_bridge.cc |
+++ b/components/arc/bluetooth/arc_bluetooth_bridge.cc |
@@ -529,7 +529,9 @@ ArcBluetoothBridge::GetDeviceProperties(mojom::BluetoothPropertyType type, |
if (type == mojom::BluetoothPropertyType::ALL || |
type == mojom::BluetoothPropertyType::BDNAME) { |
mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New(); |
- btp->set_bdname(mojo::String::From(base::UTF16ToUTF8(device->GetName()))); |
+ // TODO(615720): Use the upcoming GetName (was GetDeviceName). |
+ btp->set_bdname( |
+ mojo::String::From(base::UTF16ToUTF8(device->GetNameForDisplay()))); |
properties.push_back(std::move(btp)); |
} |
if (type == mojom::BluetoothPropertyType::ALL || |
@@ -568,7 +570,9 @@ ArcBluetoothBridge::GetDeviceProperties(mojom::BluetoothPropertyType type, |
if (type == mojom::BluetoothPropertyType::ALL || |
type == mojom::BluetoothPropertyType::REMOTE_FRIENDLY_NAME) { |
mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New(); |
- btp->set_bdname(mojo::String::From(base::UTF16ToUTF8(device->GetName()))); |
+ // TODO(615720): Use the upcoming GetName (was GetDeviceName). |
+ btp->set_bdname( |
+ mojo::String::From(base::UTF16ToUTF8(device->GetNameForDisplay()))); |
properties.push_back(std::move(btp)); |
} |
if (type == mojom::BluetoothPropertyType::ALL || |