bluetooth: Add disconnect function

content/browser/bluetooth/bluetooth_dispatcher_host.h

 // Copyright 2014 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 CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 89 matching lines @@
   void OnRequestDevice(
       int thread_id,
       int request_id,
       int frame_routing_id,
       const std::vector<content::BluetoothScanFilter>& filters,
       const std::vector<device::BluetoothUUID>& optional_services);
   void OnConnectGATT(int thread_id,
                      int request_id,
                      int frame_routing_id,
                      const std::string& device_id);
+  void OnDisconnect(int thread_id,
+                    int frame_routing_id,
+                    const std::string& device_id);
   void OnGetPrimaryService(int thread_id,
                            int request_id,
                            int frame_routing_id,
                            const std::string& device_id,
                            const std::string& service_uuid);
   void OnGetCharacteristic(int thread_id,
                            int request_id,
                            int frame_routing_id,
                            const std::string& service_instance_id,
                            const std::string& characteristic_uuid);
@@ skipping 38 matching lines @@
   // code that's still using the RequestDeviceSession, and continues with this
   // function.
   void FinishClosingChooser(int chooser_id,
                             BluetoothChooser::Event event,
                             const std::string& device_id);
 
   // Callbacks for BluetoothDevice::CreateGattConnection.
   void OnGATTConnectionCreated(
       int thread_id,
       int request_id,
+      int frame_routing_id,
       const std::string& device_id,
       base::TimeTicks start_time,
       scoped_ptr<device::BluetoothGattConnection> connection);
   void OnCreateGATTConnectionError(
       int thread_id,
       int request_id,
       const std::string& device_id,
       base::TimeTicks start_time,
       device::BluetoothDevice::ConnectErrorCode error_code);
 
@@ skipping 113 matching lines @@
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
   // Automatically stops Bluetooth discovery a set amount of time after it was
   // started. We have a single timer for all of Web Bluetooth because it's
   // simpler than tracking timeouts for each RequestDeviceSession individually,
   // and because there's no harm in extending the length of a few discovery
   // sessions when other sessions are active.
   base::Timer discovery_session_timer_;
 
   // Retain BluetoothGattConnection objects to keep connections open.
-  // TODO(scheib): Destroy as connections are closed. http://crbug.com/539643
-  ScopedVector<device::BluetoothGattConnection> connections_;
+  std::map<std::string, scoped_ptr<device::BluetoothGattConnection>>
+      device_id_to_connection_map_;
 
   // Keeps track of which devices have had their services discovered.
   std::set<std::string> devices_with_discovered_services_;
 
   // Map of device_address's to primary-services requests that need responses
   // when that device's service discovery completes.
   std::map<std::string, std::vector<PrimaryServicesRequest>>
       pending_primary_services_requests_;
 
   // |weak_ptr_on_ui_thread_| provides weak pointers, e.g. for callbacks, and
   // because it exists and has been bound to the UI thread enforces that all
   // copies verify they are also used on the UI thread.
   base::WeakPtr<BluetoothDispatcherHost> weak_ptr_on_ui_thread_;
   base::WeakPtrFactory<BluetoothDispatcherHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_