Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1225)

Unified Diff: device/bluetooth/bluetooth_device.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/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device.h
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index e548007c206da790d35f3104e4bc41b4c70a3aa8..1fed2155cecaf7039e56acde634c55dbe1233f77 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -11,6 +11,7 @@
#include <vector>
#include "base/callback.h"
+#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string16.h"
#include "device/bluetooth/bluetooth_export.h"
@@ -435,6 +436,14 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDevice {
protected:
// BluetoothGattConnection is a friend to call Add/RemoveGattConnection.
friend BluetoothGattConnection;
+ FRIEND_TEST_ALL_PREFIXES(
+ BluetoothTest,
+ BluetoothGattConnection_DisconnectGatt_SimulateConnect);
+ FRIEND_TEST_ALL_PREFIXES(
+ BluetoothTest,
+ BluetoothGattConnection_DisconnectGatt_SimulateDisconnect);
+ FRIEND_TEST_ALL_PREFIXES(BluetoothTest,
+ BluetoothGattConnection_ErrorAfterConnection);
BluetoothDevice(BluetoothAdapter* adapter);
« no previous file with comments | « device/bluetooth/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698