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

Unified Diff: device/bluetooth/bluetooth_adapter.cc

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.h ('k') | device/bluetooth/bluetooth_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter.cc
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index aba8f137c520b6e60c6130d00723c7c94a844470..f3d15bff020c00101c7b46c644482bfc37db494d 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -200,6 +200,14 @@ void BluetoothAdapter::DiscoverySessionBecameInactive(
discovery_sessions_.erase(discovery_session);
}
+void BluetoothAdapter::DeleteDeviceForTesting(const std::string& address) {
+ std::map<const std::string, BluetoothDevice*>::iterator device_iterator =
+ devices_.find(address);
+ BluetoothDevice* device = device_iterator->second;
+ devices_.erase(device_iterator);
+ delete device;
+}
+
scoped_ptr<BluetoothDiscoveryFilter>
BluetoothAdapter::GetMergedDiscoveryFilterHelper(
const BluetoothDiscoveryFilter* masked_filter,
« no previous file with comments | « device/bluetooth/bluetooth_adapter.h ('k') | device/bluetooth/bluetooth_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698