bluetooth: Implement allowed devices map

content/browser/bluetooth/bluetooth_dispatcher_host.h

 // Copyright 2014 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_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
+#include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
 #include "device/bluetooth/bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/bluetooth_gatt_service.h"
 
 namespace device {
 class BluetoothUUID;
 }
@@ skipping 71 matching lines @@
 
   // IPC Handlers, see definitions in bluetooth_messages.h.
   void OnRequestDevice(
       int thread_id,
       int request_id,
       int frame_routing_id,
       const std::vector<content::BluetoothScanFilter>& filters,
       const std::vector<device::BluetoothUUID>& optional_services);
   void OnConnectGATT(int thread_id,
                      int request_id,
+                     int frame_routing_id,
                      const std::string& device_id);
   void OnGetPrimaryService(int thread_id,
                            int request_id,
+                           int frame_routing_id,
                            const std::string& device_id,
                            const std::string& service_uuid);
   void OnGetCharacteristic(int thread_id,
                            int request_id,
+                           int frame_routing_id,
                            const std::string& service_instance_id,
                            const std::string& characteristic_uuid);
   void OnReadValue(int thread_id,
                    int request_id,
+                   int frame_routing_id,
                    const std::string& characteristic_instance_id);
   void OnWriteValue(int thread_id,
                     int request_id,
+                    int frame_routing_id,
                     const std::string& characteristic_instance_id,
                     const std::vector<uint8_t>& value);
   void OnStartNotifications(int thread_id,
                             int request_id,
+                            int frame_routing_id,
                             const std::string& characteristic_instance_id);
   void OnStopNotifications(int thread_id,
                            int request_id,
+                           int frame_routing_id,
                            const std::string& characteristic_instance_id);
   void OnRegisterCharacteristicObject(
       int thread_id,
+      int frame_routing_id,
       const std::string& characteristic_instance_id);
   void OnUnregisterCharacteristicObject(
       int thread_id,
+      int frame_routing_id,
       const std::string& characteristic_instance_id);
 
   // Callbacks for BluetoothAdapter::StartDiscoverySession.
   void OnDiscoverySessionStarted(
       int chooser_id,
       scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
   void OnDiscoverySessionStartedError(int chooser_id);
 
   // BluetoothChooser::EventHandler:
   void OnBluetoothChooserEvent(int chooser_id,
@@ skipping 59 matching lines @@
                            const std::string& characteristic_instance_id);
 
   // Functions to query the platform cache for the bluetooth object.
   // result.outcome == CacheQueryOutcome::SUCCESS if the object was found in the
   // cache. Otherwise result.outcome that can used to record the outcome and
   // result.error will contain the error that should be send to the renderer.
   // One of the possible outcomes is BAD_RENDERER. In this case the outcome
   // was already recorded and since there renderer crashed there is no need to
   // send a response.
 
-  // Queries the platform cache for a Device with |device_id|. Fills in the
-  // |outcome| field and the |device| field if successful.
-  CacheQueryResult QueryCacheForDevice(const std::string& device_id);
+  // Queries the platform cache for a Device with |device_id| for |origin|.
+  // Fills in the |outcome| field and the |device| field if successful.
+  CacheQueryResult QueryCacheForDevice(const std::string& origin,
+                                       const std::string& device_id);
   // Queries the platform cache for a Service with |service_instance_id|. Fills
   // in the |outcome| field, and |device| and |service| fields if successful.
-  CacheQueryResult QueryCacheForService(const std::string& service_instance_id);
+  CacheQueryResult QueryCacheForService(const std::string& origin,
+                                        const std::string& service_instance_id);
   // Queries the platform cache for a characteristic with
   // |characteristic_instance_id|. Fills in the |outcome| field, and |device|,
   // |service| and |characteristic| fields if successful.
   CacheQueryResult QueryCacheForCharacteristic(
+      const std::string& origin,
       const std::string& characteristic_instance_id);
 
   // Returns true if all services have been discovered for the device.
   // When the host gets a ServiceChanged indication, it automatically
   // re-discovers services, and only forwards the ServiceChanged event to this
   // class when it's done re-discovering.
-  bool IsServicesDiscoveryCompleteForDevice(const std::string& device_id);
+  bool IsServicesDiscoveryCompleteForDevice(const std::string& device_address);
 
   // Adds the PrimaryServicesRequest to the vector of pending services requests
   // for that device.
   void AddToPendingPrimaryServicesRequest(
-      const std::string& device_id,
+      const std::string& device_address,
       const PrimaryServicesRequest& request);
 
+  // Returns the origin for the frame with "frame_rounting_id" in this process.

[Jeffrey Yasskin, 2016/01/06 00:47:57]

sp: rounting

[Jeffrey Yasskin, 2016/01/06 00:47:57]

s/this process/render_process_id_/

[ortuno, 2016/01/13 01:41:44]

Done.

On 2016/01/06 at 00:47:57, Jeffrey Yasskin wrote:
Done.

+  std::string GetOrigin(int frame_routing_id);
+
   // Show help pages from the chooser dialog.
   void ShowBluetoothOverviewLink();
   void ShowBluetoothPairingLink();
   void ShowBluetoothAdapterOffLink();
   void ShowNeedLocationLink();
 
   int render_process_id_;
 
   // Maps a (thread_id,request_id) to information about its requestDevice call,
   // including the chooser dialog.
   // An entry is added to this map in OnRequestDevice, and should be removed
   // again everywhere a requestDevice() reply is sent.
   IDMap<RequestDeviceSession, IDMapOwnPointer> request_device_sessions_;
 
+  BluetoothAllowedDevicesMap allowed_devices_map_;
+
   // Maps to get the object's parent based on it's instanceID
-  // Map of service_instance_id to device_id.
+  // Map of service_instance_id to device_address.
   std::map<std::string, std::string> service_to_device_;
   // Map of characteristic_instance_id to service_instance_id.
   std::map<std::string, std::string> characteristic_to_service_;
 
   // Map that matches characteristic_instance_id to notify session.
   // TODO(ortuno): Also key by thread_id once support for web workers,
   // is added: http://crbug.com/537372
   std::map<std::string, scoped_ptr<device::BluetoothGattNotifySession>>
       characteristic_id_to_notify_session_;
 
@@ skipping 15 matching lines @@
   // sessions when other sessions are active.
   base::Timer discovery_session_timer_;
 
   // Retain BluetoothGattConnection objects to keep connections open.
   // TODO(scheib): Destroy as connections are closed. http://crbug.com/539643
   ScopedVector<device::BluetoothGattConnection> connections_;
 
   // Keeps track of which devices have had their services discovered.
   std::set<std::string> devices_with_discovered_services_;
 
-  // Map of device_id's to primary-services requests that need responses when
-  // that device's service discovery completes.
+  // Map of device_address's to primary-services requests that need responses
+  // when that device's service discovery completes.
   std::map<std::string, std::vector<PrimaryServicesRequest>>
       pending_primary_services_requests_;
 
   // |weak_ptr_on_ui_thread_| provides weak pointers, e.g. for callbacks, and
   // because it exists and has been bound to the UI thread enforces that all
   // copies verify they are also used on the UI thread.
   base::WeakPtr<BluetoothDispatcherHost> weak_ptr_on_ui_thread_;
   base::WeakPtrFactory<BluetoothDispatcherHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_