Put the RenderFrame's ID into a per-frame WebBluetooth, and plumb that back to the browser.

content/browser/bluetooth/bluetooth_dispatcher_host.cc

 // 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.
 
 // NETWORK_ERROR Note:
 // When a device can't be found in the BluetoothAdapter, that generally
 // indicates that it's gone out of range. We reject with a NetworkError in that
 // case.
 // https://webbluetoothchrome.github.io/web-bluetooth/#dom-bluetoothdevice-connectgatt
 
 #include "content/browser/bluetooth/bluetooth_dispatcher_host.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/bad_message.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/common/bluetooth/bluetooth_messages.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_gatt_service.h"
 
 using blink::WebBluetoothError;
 using device::BluetoothAdapter;
@@ skipping 102 matching lines @@
       return blink::WebBluetoothError::GATTNotSupported;
   }
   NOTREACHED();
   return blink::WebBluetoothError::GATTUntranslatedErrorCode;
 }
 
 }  //  namespace
 
 namespace content {
 
-BluetoothDispatcherHost::BluetoothDispatcherHost()
+BluetoothDispatcherHost::BluetoothDispatcherHost(int render_process_id)
     : BrowserMessageFilter(BluetoothMsgStart),
+      render_process_id_(render_process_id),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   current_delay_time_ = kDelayTime;
   if (BluetoothAdapterFactory::IsBluetoothAdapterAvailable())
     BluetoothAdapterFactory::GetAdapter(
         base::Bind(&BluetoothDispatcherHost::set_adapter,
                    weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BluetoothDispatcherHost::OnDestruct() const {
@@ skipping 30 matching lines @@
   set_adapter(mock_adapter.Pass());
 }
 
 BluetoothDispatcherHost::~BluetoothDispatcherHost() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Clear adapter, releasing observer references.
   set_adapter(scoped_refptr<device::BluetoothAdapter>());
 }
 
 struct BluetoothDispatcherHost::RequestDeviceSession {
-  RequestDeviceSession(const std::vector<BluetoothScanFilter>& filters,
+  RequestDeviceSession(int frame_routing_id,

[ortuno, 2015/07/15 23:00:46]

This is called frame_routing_id but you call it routing_id.

[Jeffrey Yasskin, 2015/07/17 01:32:44]

Yep, this is undone now that it's no longer coming from content/child.

+                       const std::vector<BluetoothScanFilter>& filters,
                        const std::vector<BluetoothUUID>& optional_services)
-      : filters(filters), optional_services(optional_services) {}
+      : frame_routing_id(frame_routing_id),
+        filters(filters),
+        optional_services(optional_services) {}
 
+  int frame_routing_id;

[scheib, 2015/07/16 01:11:46]

Perhaps add it when we need it? Or if you have a follow up patch that uses it
OK, but would be good to see that patch draft.

[Jeffrey Yasskin, 2015/07/17 01:32:44]

I've undone this storage. We'll see how it needs to be stored when I wire up the
dialog.

   std::vector<BluetoothScanFilter> filters;
   std::vector<BluetoothUUID> optional_services;
 };
 
 void BluetoothDispatcherHost::set_adapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (adapter_.get())
     adapter_->RemoveObserver(this);
   adapter_ = adapter;
@@ skipping 12 matching lines @@
           device::BluetoothDiscoveryFilter::TRANSPORT_DUAL));
   for (const BluetoothUUID& service : services) {
     discovery_filter->AddUUID(service);
   }
   return discovery_filter.Pass();
 }
 
 void BluetoothDispatcherHost::OnRequestDevice(
     int thread_id,
     int request_id,
+    int routing_id,
     const std::vector<BluetoothScanFilter>& filters,
     const std::vector<BluetoothUUID>& optional_services) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  RenderFrameHostImpl* render_frame_host =
+      RenderFrameHostImpl::FromID(render_process_id_, routing_id);
+
+  if (!render_frame_host) {
+    DLOG(WARNING)

[ortuno, 2015/07/15 23:00:46]

Should we add a histogram for this?

[Jeffrey Yasskin, 2015/07/17 01:32:44]

Will do, but not today. I'll ping Monday when it's done.

[Jeffrey Yasskin, 2015/07/21 00:47:05]

Done in https://codereview.chromium.org/1248573002.

+        << "Got a requestDevice IPC without a matching RenderFrameHost: "
+        << render_process_id_ << ", " << routing_id;
+    Send(new BluetoothMsg_RequestDeviceError(
+        thread_id, request_id, WebBluetoothError::RequestDeviceWithoutFrame));
+  }
+
   // TODO(scheib): Device selection UI: crbug.com/436280
   // TODO(scheib): Utilize BluetoothAdapter::Observer::DeviceAdded/Removed.
   if (adapter_.get()) {
     if (!request_device_sessions_
              .insert(std::make_pair(
                  std::make_pair(thread_id, request_id),
-                 RequestDeviceSession(filters, optional_services)))
+                 RequestDeviceSession(routing_id, filters, optional_services)))
              .second) {
       LOG(ERROR) << "2 requestDevice() calls with the same thread_id ("
                  << thread_id << ") and request_id (" << request_id
                  << ") shouldn't arrive at the same BluetoothDispatcherHost.";
       bad_message::ReceivedBadMessage(
           this, bad_message::BDH_DUPLICATE_REQUEST_DEVICE_ID);
     }
     adapter_->StartDiscoverySessionWithFilter(
         ComputeScanFilter(filters),
         base::Bind(&BluetoothDispatcherHost::OnDiscoverySessionStarted,
@@ skipping 386 matching lines @@
 
 void BluetoothDispatcherHost::OnWriteValueFailed(
     int thread_id,
     int request_id,
     device::BluetoothGattService::GattErrorCode error_code) {
   Send(new BluetoothMsg_WriteCharacteristicValueError(
       thread_id, request_id, TranslateGATTError(error_code)));
 }
 
 }  // namespace content