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

Unified Diff: device/bluetooth/test/mock_bluetooth_device.cc

Issue 2009753002: bluetooth: Make public BluetoothDevice::GetName method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split out name/alias Created 4 years, 5 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
Index: device/bluetooth/test/mock_bluetooth_device.cc
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc
index 844a6a680154e9839415aec7c64fae97600d7a60..891c9cf803b8952193acf414a02dd1eb5bda2deb 100644
--- a/device/bluetooth/test/mock_bluetooth_device.cc
+++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -38,6 +38,8 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
.WillByDefault(testing::Return(0));
ON_CALL(*this, GetDeviceID())
.WillByDefault(testing::Return(0));
+ ON_CALL(*this, GetName())
+ .WillByDefault(testing::Return(base::make_optional(name_)));
ON_CALL(*this, GetNameForDisplay())
.WillByDefault(testing::Return(base::UTF8ToUTF16(name_)));
ON_CALL(*this, GetDeviceType())
@@ -57,7 +59,6 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
.WillByDefault(testing::Return(false));
ON_CALL(*this, ExpectingConfirmation())
.WillByDefault(testing::Return(false));
- ON_CALL(*this, GetDeviceName()).WillByDefault(testing::Return(name_));
}
MockBluetoothDevice::~MockBluetoothDevice() {}
« no previous file with comments | « device/bluetooth/test/mock_bluetooth_device.h ('k') | extensions/browser/api/bluetooth/bluetooth_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698