bluetooth: Add disconnect function

content/browser/bluetooth/bluetooth_allowed_devices_map.cc

 // Copyright 2015 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/bluetooth_allowed_devices_map.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
     return origin_to_device_address_to_id_map_[origin][device_address];
   }
   const std::string device_id = GenerateDeviceId(origin);
   VLOG(1) << "Id generated for device: " << device_id;
 
   origin_to_device_address_to_id_map_[origin][device_address] = device_id;
   origin_to_device_id_to_address_map_[origin][device_id] = device_address;
   origin_to_device_id_to_services_map_[origin][device_id] =
       UnionOfServices(filters, optional_services);
 
+  CHECK(device_id_set_.insert(device_id).second);
+
   return origin_to_device_address_to_id_map_[origin][device_address];
 }
 
 void BluetoothAllowedDevicesMap::RemoveDevice(
     const url::Origin& origin,
     const std::string& device_address) {
   const std::string device_id = GetDeviceId(origin, device_address);
   DCHECK(!device_id.empty());
 
   // 1. Remove from all three maps.
   CHECK(origin_to_device_address_to_id_map_[origin].erase(device_address));
   CHECK(origin_to_device_id_to_address_map_[origin].erase(device_id));
   CHECK(origin_to_device_id_to_services_map_[origin].erase(device_id));
 
   // 2. Remove empty map for origin.
   if (origin_to_device_address_to_id_map_[origin].empty()) {
     CHECK(origin_to_device_address_to_id_map_.erase(origin));
     CHECK(origin_to_device_id_to_address_map_.erase(origin));
     CHECK(origin_to_device_id_to_services_map_.erase(origin));
   }
+
+  // 3. Remove from set of ids.
+  CHECK(device_id_set_.erase(device_id));
 }
 
 const std::string& BluetoothAllowedDevicesMap::GetDeviceId(
     const url::Origin& origin,
     const std::string& device_address) {
   auto address_map_iter = origin_to_device_address_to_id_map_.find(origin);
   if (address_map_iter == origin_to_device_address_to_id_map_.end()) {
     return base::EmptyString();
   }
 
@@ skipping 18 matching lines @@
 
   auto id_iter = device_id_to_address_map.find(device_id);
 
   return id_iter == device_id_to_address_map.end() ? base::EmptyString()
                                                    : id_iter->second;
 }
 
 std::string BluetoothAllowedDevicesMap::GenerateDeviceId(
     const url::Origin& origin) {
   std::string device_id = GetBase64Id();
   auto id_map_iter = origin_to_device_id_to_address_map_.find(origin);

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

I think you don't need to use the origin anymore: just check device_id_set_.

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

Done.

   if (id_map_iter == origin_to_device_id_to_address_map_.end()) {
     return device_id;
   }
-  while (ContainsKey(id_map_iter->second, device_id)) {
+  while (ContainsKey(id_map_iter->second, device_id) ||
+         ContainsKey(device_id_set_, device_id)) {
     LOG(WARNING) << "Generated repeated id.";
     device_id = GetBase64Id();
   }
   return device_id;
 }
 
 std::set<std::string> BluetoothAllowedDevicesMap::UnionOfServices(
     const std::vector<BluetoothScanFilter>& filters,
     const std::vector<BluetoothUUID>& optional_services) {
   std::set<std::string> unionOfServices;
   for (const auto& filter : filters) {
     for (const BluetoothUUID& uuid : filter.services) {
       unionOfServices.insert(uuid.canonical_value());
     }
   }
   for (const BluetoothUUID& uuid : optional_services) {
     unionOfServices.insert(uuid.canonical_value());
   }
   return unionOfServices;
 }
 
 }  // namespace content