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

Unified Diff: extensions/browser/api/bluetooth/bluetooth_apitest.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 | « extensions/browser/api/bluetooth/bluetooth_api_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/bluetooth/bluetooth_apitest.cc
diff --git a/extensions/browser/api/bluetooth/bluetooth_apitest.cc b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
index e586d4a063fb555c795f760226657eed8abcca0e..ff93bdfe1e43c0c4fdd293232b4fef42d1022cec 100644
--- a/extensions/browser/api/bluetooth/bluetooth_apitest.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
@@ -157,8 +157,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceEvents) {
EXPECT_CALL(*device2_.get(), GetDeviceName())
.WillRepeatedly(testing::Return("the real d2"));
- EXPECT_CALL(*device2_.get(), GetName())
- .WillRepeatedly(testing::Return(base::UTF8ToUTF16("the real d2")));
+ EXPECT_CALL(*device2_.get(), GetNameForDisplay())
+ .WillRepeatedly(testing::Return(base::UTF8ToUTF16("the real d2")));
event_router()->DeviceChanged(mock_adapter_, device2_.get());
event_router()->DeviceAdded(mock_adapter_, device3_.get());
@@ -414,8 +414,8 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceInfo) {
.WillRepeatedly(testing::Return("A4:17:31:00:00:00"));
EXPECT_CALL(*device1_.get(), GetDeviceName())
.WillRepeatedly(testing::Return("Chromebook Pixel"));
- EXPECT_CALL(*device1_.get(), GetName())
- .WillRepeatedly(testing::Return(base::UTF8ToUTF16("Chromebook Pixel")));
+ EXPECT_CALL(*device1_.get(), GetNameForDisplay())
+ .WillRepeatedly(testing::Return(base::UTF8ToUTF16("Chromebook Pixel")));
EXPECT_CALL(*device1_.get(), GetBluetoothClass())
.WillRepeatedly(testing::Return(0x080104));
EXPECT_CALL(*device1_.get(), GetDeviceType())
« no previous file with comments | « extensions/browser/api/bluetooth/bluetooth_api_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698