bluetooth: Use WebBluetoothDeviceId instead of string

content/browser/bluetooth/bluetooth_allowed_devices_map.h

Index: content/browser/bluetooth/bluetooth_allowed_devices_map.h
diff --git a/content/browser/bluetooth/bluetooth_allowed_devices_map.h b/content/browser/bluetooth/bluetooth_allowed_devices_map.h
index 056e6bc43904761fae1f1abcbbedfb1cf95f93ff..3210e7b68bd3ad96462843dcfa69af712201cf0f 100644
--- a/content/browser/bluetooth/bluetooth_allowed_devices_map.h
+++ b/content/browser/bluetooth/bluetooth_allowed_devices_map.h
@@ -2,15 +2,17 @@
 // 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_ALLOWED_DEVICES_MAP_
-#define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_
+#ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_H_
+#define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_H_
 
 #include <map>
 #include <memory>
-#include <set>
+#include <string>
 #include <unordered_set>
 #include <vector>
 
+#include "base/optional.h"
+#include "content/common/bluetooth/bluetooth_device_id.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
 #include "url/origin.h"
@@ -37,7 +39,7 @@ class CONTENT_EXPORT BluetoothAllowedDevicesMap final {
   // devices for that origin. Generates and returns a device id. Because
   // unique origins generate the same hash, unique origins are not supported.
   // Calling this function with a unique origin will CHECK-fail.
-  const std::string& AddDevice(
+  const BluetoothDeviceId& AddDevice(
       const url::Origin& origin,
       const std::string& device_address,
       const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options);
@@ -47,32 +49,36 @@ class CONTENT_EXPORT BluetoothAllowedDevicesMap final {
   void RemoveDevice(const url::Origin& origin,
                     const std::string& device_address);
 
-  // Returns the Bluetooth Device's id for |origin|. Returns an empty string
-  // if |origin| is not allowed to access the device.
-  const std::string& GetDeviceId(const url::Origin& origin,
-                                 const std::string& device_address);
+  // Returns the Bluetooth Device's id for |origin| if |origin| is allowed to
+  // access the device.
+  base::Optional<BluetoothDeviceId> GetDeviceId(
+      const url::Origin& origin,
+      const std::string& device_address);
 
   // For |device_id| in |origin|, returns the Bluetooth device's address. If
   // there is no such |device_id| in |origin|, returns an empty string.
   const std::string& GetDeviceAddress(const url::Origin& origin,
-                                      const std::string& device_id);
+                                      const BluetoothDeviceId& device_id);
 
   // Returns true if the origin has previously been granted access to
   // the service.
   bool IsOriginAllowedToAccessService(
       const url::Origin& origin,
-      const std::string& device_id,
+      const BluetoothDeviceId& device_id,
       const device::BluetoothUUID& service_uuid) const;
 
  private:
-  typedef std::map<std::string, std::string> DeviceAddressToIdMap;
-  typedef std::map<std::string, std::string> DeviceIdToAddressMap;
-  typedef std::map<std::string, std::unordered_set<device::BluetoothUUID>>
+  typedef std::unordered_map<std::string, BluetoothDeviceId>
+      DeviceAddressToIdMap;
+  typedef std::unordered_map<BluetoothDeviceId, std::string>
+      DeviceIdToAddressMap;
+  typedef std::unordered_map<BluetoothDeviceId,
+                             std::unordered_set<device::BluetoothUUID>>
       DeviceIdToServicesMap;
 
   // Returns an id guaranteed to be unique for the map. The id is randomly
   // generated so that an origin can't guess the id used in another origin.
-  std::string GenerateDeviceId();
+  BluetoothDeviceId GenerateUniqueDeviceId();
   void AddUnionOfServicesTo(
       const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options,
       std::unordered_set<device::BluetoothUUID>* unionOfServices);
@@ -89,9 +95,9 @@ class CONTENT_EXPORT BluetoothAllowedDevicesMap final {
       origin_to_device_id_to_services_map_;
 
   // Keep track of all device_ids in the map.
-  std::set<std::string> device_id_set_;
+  std::unordered_set<BluetoothDeviceId> device_id_set_;
 };
 
 }  //  namespace content
 
-#endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_
+#endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_H_