bluetooth: Add disconnect function

content/browser/bluetooth/bluetooth_dispatcher_host.cc

Index: content/browser/bluetooth/bluetooth_dispatcher_host.cc
diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.cc b/content/browser/bluetooth/bluetooth_dispatcher_host.cc
index c8a4732f51e43a3e90c5c940cfa1e0c5c20e40ef..362c192792a45cad20929cb1203103ff571379fa 100644
--- a/content/browser/bluetooth/bluetooth_dispatcher_host.cc
+++ b/content/browser/bluetooth/bluetooth_dispatcher_host.cc
@@ -279,6 +279,7 @@ bool BluetoothDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(BluetoothDispatcherHost, message)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_RequestDevice, OnRequestDevice)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_ConnectGATT, OnConnectGATT)
+  IPC_MESSAGE_HANDLER(BluetoothHostMsg_Disconnect, OnDisconnect)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_GetPrimaryService, OnGetPrimaryService)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_GetCharacteristic, OnGetCharacteristic)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_ReadValue, OnReadValue)
@@ -321,7 +322,7 @@ void BluetoothDispatcherHost::SetBluetoothAdapterForTesting(
     characteristic_to_service_.clear();
     characteristic_id_to_notify_session_.clear();
     active_characteristic_threads_.clear();
-    connections_.clear();
+    device_id_to_connection_map_.clear();
     devices_with_discovered_services_.clear();
   }
 
@@ -435,7 +436,6 @@ struct BluetoothDispatcherHost::PrimaryServicesRequest {
 void BluetoothDispatcherHost::set_adapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  connections_.clear();
   if (adapter_.get())
     adapter_->RemoveObserver(this);
   adapter_ = adapter;
@@ -735,15 +735,51 @@ void BluetoothDispatcherHost::OnConnectGATT(int thread_id,
     return;
   }
 
+  // If we are already connected no need to connect again.
+  auto connection_iter = device_id_to_connection_map_.find(device_id);
+  if (connection_iter != device_id_to_connection_map_.end()) {
+    if (connection_iter->second->IsConnected()) {
+      VLOG(1) << "Already connected.";
+      Send(new BluetoothMsg_ConnectGATTSuccess(thread_id, request_id,
+                                               device_id));
+      return;
+    }
+  }
+
   query_result.device->CreateGattConnection(
       base::Bind(&BluetoothDispatcherHost::OnGATTConnectionCreated,
-                 weak_ptr_on_ui_thread_, thread_id, request_id, device_id,
-                 start_time),
+                 weak_ptr_on_ui_thread_, thread_id, request_id,
+                 frame_routing_id, device_id, start_time),
       base::Bind(&BluetoothDispatcherHost::OnCreateGATTConnectionError,
                  weak_ptr_on_ui_thread_, thread_id, request_id, device_id,
                  start_time));
 }
 
+void BluetoothDispatcherHost::OnDisconnect(int thread_id,
+                                           int frame_routing_id,
+                                           const std::string& device_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  RecordWebBluetoothFunctionCall(
+      UMAWebBluetoothFunction::REMOTE_GATT_SERVER_DISCONNECT);
+
+  // Make sure the origin is allowed to access the device. We perform this check
+  // in case a hostile renderer is trying to disconnect a device that the
+  // renderer is not allowed to access.
+  if (allowed_devices_map_.GetDeviceAddress(GetOrigin(frame_routing_id),
+                                            device_id)
+          .empty()) {
+    bad_message::ReceivedBadMessage(
+        this, bad_message::BDH_DEVICE_NOT_ALLOWED_FOR_ORIGIN);
+    return;
+  }
+
+  // The last BluetoothGattConnection for a device closes the connection when
+  // it's destroyed.
+  if (device_id_to_connection_map_.erase(device_id)) {

[Jeffrey Yasskin, 2016/01/14 22:13:18]

What happens if the OnDisconnect comes in after CreateGattConnection() was
called, but before it calls OnGATTConnectionCreated?

It should probably result in any connection getting disconnected.

[ortuno, 2016/01/15 01:00:08]

As discussed, we should do this once we can cancel pending connection attempts
since it will make it much easier.

[Jeffrey Yasskin, 2016/01/15 01:12:19]

Yep.

+    VLOG(1) << "Disconnecting device: " << device_id;
+  }
+}
+
 void BluetoothDispatcherHost::OnGetPrimaryService(
     int thread_id,
     int request_id,
@@ -1189,11 +1225,12 @@ void BluetoothDispatcherHost::FinishClosingChooser(
 void BluetoothDispatcherHost::OnGATTConnectionCreated(
     int thread_id,
     int request_id,
+    int frame_routing_id,

[Jeffrey Yasskin, 2016/01/14 22:13:18]

It looks like you don't actually need this argument.

[ortuno, 2016/01/15 01:00:08]

Done.

     const std::string& device_id,
     base::TimeTicks start_time,
     scoped_ptr<device::BluetoothGattConnection> connection) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  connections_.push_back(std::move(connection));
+  device_id_to_connection_map_[device_id] = std::move(connection);
   RecordConnectGATTTimeSuccess(base::TimeTicks::Now() - start_time);
   RecordConnectGATTOutcome(UMAConnectGATTOutcome::SUCCESS);
   Send(new BluetoothMsg_ConnectGATTSuccess(thread_id, request_id, device_id));