device/bluetooth/test/mock_bluetooth_device.cc - Issue 2217573002: bluetooth: Only add new devices, connected devices and devices that changed.

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 2217573002: bluetooth: Only add new devices, connected devices and devices that changed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-add-or-update

Patch Set: Fix typo Created 4 years, 4 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/test/mock_bluetooth_device.h ('k') | third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser/consecutive-calls.html » ('j') | no next file with comments »
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 39d27c82c606a4f1fd1079d85a96dff6daacf587..b593da0ed961aa8c314433bd3739282cb4c8d6d4 100644

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

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

@@ -48,11 +48,13 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,

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

ON_CALL(*this, IsConnected())

.WillByDefault(testing::ReturnPointee(&connected_));

+ ON_CALL(*this, IsGattConnected())

+ .WillByDefault(testing::ReturnPointee(&connected_));

ON_CALL(*this, IsConnectable())

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

ON_CALL(*this, IsConnecting())

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

- ON_CALL(*this, GetUUIDs()).WillByDefault(testing::Return(uuids_));

+ ON_CALL(*this, GetUUIDs()).WillByDefault(testing::ReturnPointee(&uuids_));

ON_CALL(*this, ExpectingPinCode())

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

ON_CALL(*this, ExpectingPasskey())