arc/bluetooth: Save BluetoothGattConnection objects

components/arc/bluetooth/arc_bluetooth_bridge.h

 // 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.
 
 #ifndef COMPONENTS_ARC_BLUETOOTH_ARC_BLUETOOTH_BRIDGE_H_
 #define COMPONENTS_ARC_BLUETOOTH_ARC_BLUETOOTH_BRIDGE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 273 matching lines @@
   void OnPairedError(
       mojom::BluetoothAddressPtr addr,
       device::BluetoothDevice::ConnectErrorCode error_code) const;
   void OnForgetDone(mojom::BluetoothAddressPtr addr) const;
   void OnForgetError(mojom::BluetoothAddressPtr addr) const;
 
   void OnGattConnectStateChanged(mojom::BluetoothAddressPtr addr,
                                  bool connected) const;
   void OnGattConnected(
       mojom::BluetoothAddressPtr addr,
-      std::unique_ptr<device::BluetoothGattConnection> connection) const;
+      std::unique_ptr<device::BluetoothGattConnection> connection);
   void OnGattConnectError(
       mojom::BluetoothAddressPtr addr,
       device::BluetoothDevice::ConnectErrorCode error_code) const;
-  void OnGattDisconnected(mojom::BluetoothAddressPtr addr) const;
+  void OnGattDisconnected(mojom::BluetoothAddressPtr addr);
 
   void OnStartLEListenDone(const StartLEListenCallback& callback,
                            scoped_refptr<device::BluetoothAdvertisement> adv);
   void OnStartLEListenError(
       const StartLEListenCallback& callback,
       device::BluetoothAdvertisement::ErrorCode error_code);
 
   void OnStopLEListenDone(const StopLEListenCallback& callback);
   void OnStopLEListenError(
       const StopLEListenCallback& callback,
@@ skipping 69 matching lines @@
   // Map from Android int handle to Chrome (BlueZ) string identifier.
   std::unordered_map<int32_t, std::string> gatt_identifier_;
   // Map from Chrome (BlueZ) string identifier to android int handle.
   std::unordered_map<std::string, int32_t> gatt_handle_;
   // Store last GattCharacteristic added to each GattService for GattServer.
   std::unordered_map<int32_t, int32_t> last_characteristic_;
   // Monotonically increasing value to use as handle to give to Android side.
   int32_t gatt_server_attribute_next_handle_ = 0;
   // Keeps track of all devices which initiated a GATT connection to us.
   std::unordered_set<std::string> gatt_connection_cache_;
+  // Map of device address to GATT connection objects for connections we
+  // have made.
+  std::unordered_map<std::string,
+                     std::unique_ptr<device::BluetoothGattConnection>>
+      gatt_connections_;

[Luis Héctor Chávez, 2016/09/07 19:54:15]

nit: Add a comment that we are holding these just to avoid immediate expiration.

   // Timer to turn adapter discoverable off.
   base::OneShotTimer discoverable_off_timer_;
 
   base::ThreadChecker thread_checker_;
 
   // WeakPtrFactory to use for callbacks.
   base::WeakPtrFactory<ArcBluetoothBridge> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBluetoothBridge);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_BLUETOOTH_ARC_BLUETOOTH_BRIDGE_H_