device/bluetooth/bluetooth_adapter.h - Issue 1256313002: bluetooth: android: Implement & test CreateGattConnection.

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/bluetooth_adapter.h

Issue 1256313002: bluetooth: android: Implement & test CreateGattConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Split tests up into smaller tests Created 5 years, 3 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/android/java/src/org/chromium/device/bluetooth/Wrappers.java ('k') | device/bluetooth/bluetooth_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter.h

diff --git a/device/bluetooth/bluetooth_adapter.h b/device/bluetooth/bluetooth_adapter.h

index 3c74ff9ad69f67ecbcd1449612c143b238bb1ac7..06c529532e6dd6719a4d3c1fcad04d94da45ee0f 100644

--- a/device/bluetooth/bluetooth_adapter.h

+++ b/device/bluetooth/bluetooth_adapter.h

@@ -386,6 +386,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapter

protected:

friend class base::RefCounted<BluetoothAdapter>;

friend class BluetoothDiscoverySession;

+ friend class BluetoothTestBase;

typedef std::map<const std::string, BluetoothDevice*> DevicesMap;

typedef std::pair<BluetoothDevice::PairingDelegate*, PairingDelegatePriority>

@@ -474,6 +475,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapter

void DiscoverySessionBecameInactive(

BluetoothDiscoverySession* discovery_session);

+ void DeleteDeviceForTesting(const std::string& address);

// Observers of BluetoothAdapter, notified from implementation subclasses.

base::ObserverList<device::BluetoothAdapter::Observer> observers_;