Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Unified Diff: device/bluetooth/bluez/bluetooth_bluez_unittest.cc

Issue 2017393002: bluetooth: Rename device's GetName to GetNameForDisplay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_device_unittest.cc ('k') | device/bluetooth/test/mock_bluetooth_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluez/bluetooth_bluez_unittest.cc
diff --git a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
index 171430bbc89abbbd77ce7c1409eaa3e49b4fa4c1..01851ffc6a1604345a40a2f06c7e0e14a503377f 100644
--- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
@@ -2153,7 +2153,7 @@ TEST_F(BluetoothBlueZTest, DeviceProperties) {
// Verify the other device properties.
EXPECT_EQ(
base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceName),
- devices[idx]->GetName());
+ devices[idx]->GetNameForDisplay());
EXPECT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());
EXPECT_TRUE(devices[idx]->IsPaired());
EXPECT_FALSE(devices[idx]->IsConnected());
@@ -2328,7 +2328,7 @@ TEST_F(BluetoothBlueZTest, DeviceNameChanged) {
devices[idx]->GetAddress());
ASSERT_EQ(
base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceName),
- devices[idx]->GetName());
+ devices[idx]->GetNameForDisplay());
// Install an observer; expect the DeviceChanged method to be called when
// we change the alias of the device.
@@ -2344,7 +2344,7 @@ TEST_F(BluetoothBlueZTest, DeviceNameChanged) {
EXPECT_EQ(1, observer.device_changed_count());
EXPECT_EQ(devices[idx], observer.last_device());
- EXPECT_EQ(base::UTF8ToUTF16(new_name), devices[idx]->GetName());
+ EXPECT_EQ(base::UTF8ToUTF16(new_name), devices[idx]->GetNameForDisplay());
}
TEST_F(BluetoothBlueZTest, DeviceAddressChanged) {
@@ -2361,7 +2361,7 @@ TEST_F(BluetoothBlueZTest, DeviceAddressChanged) {
devices[idx]->GetAddress());
ASSERT_EQ(
base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceName),
- devices[idx]->GetName());
+ devices[idx]->GetNameForDisplay());
// Install an observer; expect the DeviceAddressChanged method to be called
// when we change the alias of the device.
« no previous file with comments | « device/bluetooth/bluetooth_device_unittest.cc ('k') | device/bluetooth/test/mock_bluetooth_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698