device/bluetooth/test/mock_bluetooth_gatt_connection.cc - Issue 1284073002: bluetooth: Add adapter to BluetoothDevice

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_gatt_connection.cc

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-

Patch Set: Updated patchset dependency Created 5 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

« device/bluetooth/bluetooth_device_chromeos.cc ('K') | « device/bluetooth/test/mock_bluetooth_gatt_connection.h ('k') | extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/test/mock_bluetooth_gatt_connection.cc

diff --git a/device/bluetooth/test/mock_bluetooth_gatt_connection.cc b/device/bluetooth/test/mock_bluetooth_gatt_connection.cc

index 7f06a9f1bf705ed6a7b6a8948bcd00e727de9af1..9af0128b6d144e1ccfce85f41ba75e4000de919d 100644

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

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

@@ -4,12 +4,16 @@

#include "device/bluetooth/test/mock_bluetooth_gatt_connection.h"

+#include "device/bluetooth/bluetooth_adapter.h"

using ::testing::Return;

namespace device {

MockBluetoothGattConnection::MockBluetoothGattConnection(

- const std::string& device_address) {

+ scoped_refptr<device::BluetoothAdapter> adapter,

+ const std::string& device_address)

+ : BluetoothGattConnection(/* Next Patch: adapter.get(), device_address */) {

Jeffrey Yasskin 2015/08/19 22:19:04 Just |adapter|. .get() risks holding a pointer to

scheib 2015/09/13 02:40:11 Done.

ON_CALL(*this, GetDeviceAddress()).WillByDefault(Return(device_address));

ON_CALL(*this, IsConnected()).WillByDefault(Return(true));

}