| Index: content/renderer/bluetooth/bluetooth_dispatcher.cc
|
| diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.cc b/content/renderer/bluetooth/bluetooth_dispatcher.cc
|
| index 3ffec026dcf2f7af11437afcaa572f2cf2f6371d..47185df3b0d86da41a45edfea537f5d49ec48758 100644
|
| --- a/content/renderer/bluetooth/bluetooth_dispatcher.cc
|
| +++ b/content/renderer/bluetooth/bluetooth_dispatcher.cc
|
| @@ -60,20 +60,6 @@ int CurrentWorkerId() {
|
| return WorkerThread::GetCurrentId();
|
| }
|
|
|
| -WebBluetoothDevice::VendorIDSource GetWebVendorIdSource(
|
| - device::BluetoothDevice::VendorIDSource vendor_id_source) {
|
| - switch (vendor_id_source) {
|
| - case device::BluetoothDevice::VENDOR_ID_UNKNOWN:
|
| - return WebBluetoothDevice::VendorIDSource::Unknown;
|
| - case device::BluetoothDevice::VENDOR_ID_BLUETOOTH:
|
| - return WebBluetoothDevice::VendorIDSource::Bluetooth;
|
| - case device::BluetoothDevice::VENDOR_ID_USB:
|
| - return WebBluetoothDevice::VendorIDSource::USB;
|
| - }
|
| - NOTREACHED();
|
| - return WebBluetoothDevice::VendorIDSource::Unknown;
|
| -}
|
| -
|
| } // namespace
|
|
|
| BluetoothDispatcher::BluetoothDispatcher(ThreadSafeSender* sender)
|
| @@ -196,9 +182,7 @@ void BluetoothDispatcher::OnRequestDeviceSuccess(
|
| pending_requests_.Lookup(request_id)
|
| ->onSuccess(base::WrapUnique(new WebBluetoothDevice(
|
| WebString::fromUTF8(device.id), WebString(device.name),
|
| - device.tx_power, device.rssi, device.device_class,
|
| - GetWebVendorIdSource(device.vendor_id_source), device.vendor_id,
|
| - device.product_id, device.product_version, uuids)));
|
| + device.tx_power, device.rssi, uuids)));
|
| pending_requests_.Remove(request_id);
|
| }
|
|
|
|
|