Refactor BluetoothAllowedDevicesMap

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 3dd20114456556d6e3f518fd2e8e1ae0333004f3..a89921b08e06f5ee795cfc9507ec8910bdd7f1c5 100644
--- a/content/browser/bluetooth/bluetooth_allowed_devices_map.h
+++ b/content/browser/bluetooth/bluetooth_allowed_devices_map.h
@@ -1,112 +1,45 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 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_ALLOWED_DEVICES_MAP_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_H_
 
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
+#include <map>
 
-#include "base/optional.h"
-#include "content/common/bluetooth/web_bluetooth_device_id.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
-#include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
 #include "url/origin.h"
 
-namespace device {
-class BluetoothUUID;
-}
-
 namespace content {
 
-// Keeps track of which origins are allowed to access which devices and
-// their services.
-//
-// |AddDevice| generates device ids, which are random strings that are unique
-// in the map.
-class CONTENT_EXPORT BluetoothAllowedDevicesMap final {
+class BluetoothAllowedDevices;
+
+// Class for keeping track of which origins are allowed to access which
+// Bluetooth devices and their services.
+class CONTENT_EXPORT BluetoothAllowedDevicesMap
+    : public base::RefCountedThreadSafe<BluetoothAllowedDevicesMap> {
  public:
   BluetoothAllowedDevicesMap();
-  ~BluetoothAllowedDevicesMap();
-
-  // Adds the Bluetooth Device with |device_address| to the map of allowed
-  // 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 WebBluetoothDeviceId& AddDevice(
-      const url::Origin& origin,
-      const std::string& device_address,
-      const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options);
-
-  // Removes the Bluetooth Device with |device_address| from the map of allowed
-  // devices for |origin|.
-  void RemoveDevice(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.
-  const WebBluetoothDeviceId* GetDeviceId(const url::Origin& origin,
-                                          const std::string& device_address);
+  // Gets a BluetoothAllowedDevices for each origin; creates one if it doesn't
+  // exist.
+  content::BluetoothAllowedDevices& GetOrCreateAllowedDevices(
+      const url::Origin& origin);
 
-  // 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 WebBluetoothDeviceId& device_id);
-
-  // Returns true if the origin has previously been granted access to at least
-  // one service.
-  bool IsOriginAllowedToAccessAtLeastOneService(
-      const url::Origin& origin,
-      const WebBluetoothDeviceId& device_id) const;
-
-  // Returns true if the origin has previously been granted access to
-  // the service.
-  bool IsOriginAllowedToAccessService(
-      const url::Origin& origin,
-      const WebBluetoothDeviceId& device_id,
-      const device::BluetoothUUID& service_uuid) const;
+  // Clears the data in |origin_to_allowed_devices_map_|.
+  void Clear();
 
  private:
-  typedef std::unordered_map<std::string, WebBluetoothDeviceId>
-      DeviceAddressToIdMap;
-  typedef std::unordered_map<WebBluetoothDeviceId,
-                             std::string,
-                             WebBluetoothDeviceIdHash>
-      DeviceIdToAddressMap;
-  typedef std::unordered_map<
-      WebBluetoothDeviceId,
-      std::unordered_set<device::BluetoothUUID, device::BluetoothUUIDHash>,
-      WebBluetoothDeviceIdHash>
-      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.
-  WebBluetoothDeviceId GenerateUniqueDeviceId();
-  void AddUnionOfServicesTo(
-      const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options,
-      std::unordered_set<device::BluetoothUUID, device::BluetoothUUIDHash>*
-          unionOfServices);
-
-  // TODO(ortuno): Now that there is only one instance of this class per frame
-  // and that this map gets destroyed when navigating consider removing the
-  // origin mapping.
-  // http://crbug.com/610343
-  std::map<url::Origin, DeviceAddressToIdMap>
-      origin_to_device_address_to_id_map_;
-  std::map<url::Origin, DeviceIdToAddressMap>
-      origin_to_device_id_to_address_map_;
-  std::map<url::Origin, DeviceIdToServicesMap>
-      origin_to_device_id_to_services_map_;
+  friend class base::RefCountedThreadSafe<BluetoothAllowedDevicesMap>;
+  ~BluetoothAllowedDevicesMap();
+  std::map<url::Origin, content::BluetoothAllowedDevices>
+      origin_to_allowed_devices_map_;
 
-  // Keep track of all device_ids in the map.
-  std::unordered_set<WebBluetoothDeviceId, WebBluetoothDeviceIdHash>
-      device_id_set_;
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAllowedDevicesMap);
 };
 
 }  //  namespace content
 
-#endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_H_
+#endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ALLOWED_DEVICES_MAP_H_