bluetooth: Remove the device info and device class fields from BluetoothDevice.

content/renderer/bluetooth/bluetooth_dispatcher.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.
 
 #include "content/renderer/bluetooth/bluetooth_dispatcher.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 42 matching lines @@
 
 base::LazyInstance<base::ThreadLocalPointer<void>>::Leaky g_dispatcher_tls =
     LAZY_INSTANCE_INITIALIZER;
 
 void* const kHasBeenDeleted = reinterpret_cast<void*>(0x1);
 
 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)
     : thread_safe_sender_(sender) {
   g_dispatcher_tls.Pointer()->Set(static_cast<void*>(this));
 }
 
 BluetoothDispatcher::~BluetoothDispatcher() {
   g_dispatcher_tls.Pointer()->Set(kHasBeenDeleted);
 }
@@ skipping 102 matching lines @@
     const BluetoothDevice& device) {
   DCHECK(pending_requests_.Lookup(request_id)) << request_id;
 
   WebVector<WebString> uuids(device.uuids.size());
   for (size_t i = 0; i < device.uuids.size(); ++i)
     uuids[i] = WebString::fromUTF8(device.uuids[i].c_str());
 
   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);
 }
 
 void BluetoothDispatcher::OnRequestDeviceError(int thread_id,
                                                int request_id,
                                                WebBluetoothError error) {
   DCHECK(pending_requests_.Lookup(request_id)) << request_id;
   pending_requests_.Lookup(request_id)->onError(WebBluetoothError(error));
   pending_requests_.Remove(request_id);
 }
@@ skipping 32 matching lines @@
                                                    int request_id,
                                                    WebBluetoothError error) {
   DCHECK(pending_primary_service_requests_.Lookup(request_id)) << request_id;
 
   pending_primary_service_requests_.Lookup(request_id)
       ->callbacks->onError(WebBluetoothError(error));
   pending_primary_service_requests_.Remove(request_id);
 }
 
 }  // namespace content