| 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() {}
|
|
|