Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

content/browser/bluetooth/frame_connected_bluetooth_devices.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 "content/browser/bluetooth/frame_connected_bluetooth_devices.h"
 
 #include "base/optional.h"
 #include "base/strings/string_util.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 11 matching lines @@
     DecrementDevicesConnectedCount();
   }
 }
 
 bool FrameConnectedBluetoothDevices::IsConnectedToDeviceWithId(
     const WebBluetoothDeviceId& device_id) {
   auto connection_iter = device_id_to_connection_map_.find(device_id);
   if (connection_iter == device_id_to_connection_map_.end()) {
     return false;
   }
-  DCHECK(connection_iter->second->IsConnected());
+  DCHECK(connection_iter->second.first->IsConnected());
   return true;
 }
 
 void FrameConnectedBluetoothDevices::Insert(
     const WebBluetoothDeviceId& device_id,
-    std::unique_ptr<device::BluetoothGattConnection> connection) {
+    std::unique_ptr<device::BluetoothGattConnection> connection,
+    blink::mojom::WebBluetoothServerClientAssociatedPtr client) {
   if (device_id_to_connection_map_.find(device_id) !=

[ortuno, 2017/02/24 03:28:52]

This is another place where we are missing tests. We should add a test for:

device.gatt.connect();
device.gatt.connect();

Right now that causes OnCreateGATTConnectionSuccess to call Insert twice and
then send the request for that pointer. But because Insert ignores the second
value the pointer gets destroyed.

[juncai, 2017/03/01 02:04:12]

Done.

       device_id_to_connection_map_.end()) {
     // It's possible for WebBluetoothServiceImpl to issue two successive
     // connection requests for which it would get two successive responses
     // and consequently try to insert two BluetoothGattConnections for the
     // same device. WebBluetoothServiceImpl should reject or queue connection
     // requests if there is a pending connection already, but the platform
     // abstraction doesn't currently support checking for pending connections.
     // TODO(ortuno): CHECK that this never happens once the platform
     // abstraction allows to check for pending connections.
     // http://crbug.com/583544
     return;
   }
   device_address_to_id_map_[connection->GetDeviceAddress()] = device_id;
-  device_id_to_connection_map_[device_id] = std::move(connection);
+  device_id_to_connection_map_[device_id] =
+      std::make_pair(std::move(connection), std::move(client));
   IncrementDevicesConnectedCount();
 }
 
 void FrameConnectedBluetoothDevices::CloseConnectionToDeviceWithId(
     const WebBluetoothDeviceId& device_id) {
   auto connection_iter = device_id_to_connection_map_.find(device_id);
   if (connection_iter == device_id_to_connection_map_.end()) {
     return;
   }
   CHECK(device_address_to_id_map_.erase(
-      connection_iter->second->GetDeviceAddress()));
+      connection_iter->second.first->GetDeviceAddress()));
   device_id_to_connection_map_.erase(connection_iter);
   DecrementDevicesConnectedCount();
 }
 
 base::Optional<WebBluetoothDeviceId>
 FrameConnectedBluetoothDevices::CloseConnectionToDeviceWithAddress(
     const std::string& device_address) {
   auto device_address_iter = device_address_to_id_map_.find(device_address);
   if (device_address_iter == device_address_to_id_map_.end()) {
     return base::nullopt;
   }
   WebBluetoothDeviceId device_id = device_address_iter->second;
+  auto device_id_iter = device_id_to_connection_map_.find(device_id);
+  CHECK(device_id_iter != device_id_to_connection_map_.end());
+  if (device_id_iter->second.second) {
+    device_id_iter->second.second->GattServerDisconnected();
+  }
   CHECK(device_address_to_id_map_.erase(device_address));
-  CHECK(device_id_to_connection_map_.erase(device_id));
+  device_id_to_connection_map_.erase(device_id);
   DecrementDevicesConnectedCount();
   return base::make_optional(device_id);
 }
 
 void FrameConnectedBluetoothDevices::IncrementDevicesConnectedCount() {
   web_contents_impl_->IncrementBluetoothConnectedDeviceCount();
 }
 
 void FrameConnectedBluetoothDevices::DecrementDevicesConnectedCount() {
   web_contents_impl_->DecrementBluetoothConnectedDeviceCount();
 }
 
 }  // namespace content