arc/bluetooth: Save BluetoothGattConnection objects

components/arc/bluetooth/arc_bluetooth_bridge.cc

 // Copyright 2016 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 "components/arc/bluetooth/arc_bluetooth_bridge.h"
 
 #include <bluetooth/bluetooth.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 925 matching lines @@
     return;
 
   DCHECK(addr);
 
   arc_bridge_service()->bluetooth()->instance()->OnLEConnectionStateChange(
       std::move(addr), connected);
 }
 
 void ArcBluetoothBridge::OnGattConnected(
     mojom::BluetoothAddressPtr addr,
-    std::unique_ptr<BluetoothGattConnection> connection) const {
+    std::unique_ptr<BluetoothGattConnection> connection) {
+  DCHECK(CalledOnValidThread());
+  gatt_connections_.emplace(addr->To<std::string>(), std::move(connection));

[Rahul Chaturvedi, 2016/09/07 21:31:38]

Also, don't expect to "not" have the address in this map. It is possible to not
get a disconnected event and again get a connnected event.

[Rahul Chaturvedi, 2016/09/07 21:31:39]

can't use map::emplace

[Eric Caruso, 2016/09/07 21:33:31]

I switched this out for operator[] which will cause the old std::unique_ptr to
be destroyed if this happens.

   OnGattConnectStateChanged(std::move(addr), true);
 }
 
 void ArcBluetoothBridge::OnGattConnectError(
     mojom::BluetoothAddressPtr addr,
     BluetoothDevice::ConnectErrorCode error_code) const {
   OnGattConnectStateChanged(std::move(addr), false);
 }
 
 void ArcBluetoothBridge::OnGattDisconnected(
-    mojom::BluetoothAddressPtr addr) const {
+    mojom::BluetoothAddressPtr addr) {
+  DCHECK(CalledOnValidThread());
+  auto it = gatt_connections_.find(addr->To<std::string>());
+  if (it == gatt_connections_.end())

[Rahul Chaturvedi, 2016/09/07 21:31:38]

nit: {} around multiline

+    LOG(WARNING) << "OnGattDisconnected called, "
+                 << "but no gatt connection was found";
+  else
+    gatt_connections_.erase(it);
+
   OnGattConnectStateChanged(std::move(addr), false);
 }
 
 void ArcBluetoothBridge::ConnectLEDevice(
     mojom::BluetoothAddressPtr remote_addr) {
   if (!HasBluetoothInstance())
     return;
 
   BluetoothDevice* device =
       bluetooth_adapter_->GetDevice(remote_addr->To<std::string>());
@@ skipping 864 matching lines @@
   LOG(WARNING) << "Bluetooth instance is too old (version " << version
                << ") need version " << version_need;
   return false;
 }
 
 bool ArcBluetoothBridge::CalledOnValidThread() {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace arc