device/bluetooth/test/mock_bluetooth_device.cc - Issue 735893002: Add GetConnectionInfo function for BluetoothDevice, replacing the existing

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 735893002: Add GetConnectionInfo function for BluetoothDevice, replacing the existing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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

« device/bluetooth/bluetooth_device_mac.mm ('K') | « device/bluetooth/test/mock_bluetooth_device.h ('k') | extensions/browser/api/bluetooth/bluetooth_api_utils.cc » ('j') | extensions/browser/api/bluetooth/bluetooth_api_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e8130da3d46f6fee4c54d849f9055dd1d5274eec..5235d5b3b01c8b8a3dad312cbc38cd520ce6c516 100644

--- a/device/bluetooth/test/mock_bluetooth_device.cc

+++ b/device/bluetooth/test/mock_bluetooth_device.cc

@@ -26,12 +26,6 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,

.WillByDefault(testing::Return(address_));

ON_CALL(*this, GetDeviceType())

.WillByDefault(testing::Return(DEVICE_UNKNOWN));

- ON_CALL(*this, GetRSSI())

- .WillByDefault(testing::Return(kUnknownPower));

- ON_CALL(*this, GetCurrentHostTransmitPower())

- .WillByDefault(testing::Return(kUnknownPower));

- ON_CALL(*this, GetMaximumHostTransmitPower())

- .WillByDefault(testing::Return(kUnknownPower));

Ilya Sherman 2014/11/19 22:18:07 Do you not need a default value to return for call

Tim Song 2014/12/06 00:51:38 GetConnectionInfo is an async method, so adding a

ON_CALL(*this, GetVendorIDSource())

.WillByDefault(testing::Return(VENDOR_ID_UNKNOWN));

ON_CALL(*this, GetVendorID())