bluetooth: android: Implement & test CreateGattConnection.

device/bluetooth/bluetooth_adapter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_adapter.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "device/bluetooth/bluetooth_device.h"
@@ skipping 182 matching lines @@
     (*iter)->MarkAsInactive();
   }
 }
 
 void BluetoothAdapter::DiscoverySessionBecameInactive(
     BluetoothDiscoverySession* discovery_session) {
   DCHECK(!discovery_session->IsActive());
   discovery_sessions_.erase(discovery_session);
 }
 
+void BluetoothAdapter::DeleteDeviceForTesting(const std::string& address) {
+  std::map<const std::string, BluetoothDevice*>::iterator device =
+      devices_.find(address);
+  devices_.erase(device);
+  delete device->second;

[Jeffrey Yasskin, 2015/09/16 01:40:49]

Erasing device invalidates it, so you need to copy device->second or delete it
before the erase() call. I haven't checked whether ~BluetoothDevice can call
back into the map. If so, you'd need to copy, erase, delete.

[scheib, 2015/09/16 21:55:17]

Done.

+}
+
 scoped_ptr<BluetoothDiscoveryFilter>
 BluetoothAdapter::GetMergedDiscoveryFilterHelper(
     const BluetoothDiscoveryFilter* masked_filter,
     bool omit) const {
   scoped_ptr<BluetoothDiscoveryFilter> result;
   bool first_merge = true;
 
   std::set<BluetoothDiscoverySession*> temp(discovery_sessions_);
   for (const auto& iter : temp) {
     const BluetoothDiscoveryFilter* curr_filter = iter->GetDiscoveryFilter();
@@ skipping 35 matching lines @@
 
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStopOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Stop.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
 }  // namespace device