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

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

 // Copyright 2015 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/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 570 matching lines @@
 // Devices
 
 // static
 std::unique_ptr<NiceMockBluetoothDevice>
 LayoutTestBluetoothAdapterProvider::GetBaseDevice(
     MockBluetoothAdapter* adapter,
     const std::string& device_name,
     device::BluetoothDevice::UUIDList uuids,
     const std::string& address) {
   std::unique_ptr<NiceMockBluetoothDevice> device(new NiceMockBluetoothDevice(
-      adapter, 0x1F00 /* Bluetooth class */, device_name, address,

[ortuno, 2016/04/27 20:16:41]

You still need these. Bluez still relies on this constructor for its tests.

-      true /* paired */, true /* connected */));
+      adapter, device_name, address, true /* paired */, true /* connected */));
 
   ON_CALL(*device, GetUUIDs()).WillByDefault(Return(uuids));
 
   // Using Invoke allows the device returned from this method to be futher
   // modified and have more services added to it. The call to ::GetGattServices
   // will invoke ::GetMockServices, returning all services added up to that
   // time.
   ON_CALL(*device, GetGattServices())
       .WillByDefault(
           Invoke(device.get(), &MockBluetoothDevice::GetMockServices));
   // The call to BluetoothDevice::GetGattService will invoke ::GetMockService
   // which returns a service matching the identifier provided if the service
   // was added to the mock.
   ON_CALL(*device, GetGattService(_))
       .WillByDefault(
           Invoke(device.get(), &MockBluetoothDevice::GetMockService));
 
-  ON_CALL(*device, GetVendorIDSource())
-      .WillByDefault(Return(BluetoothDevice::VENDOR_ID_BLUETOOTH));
-  ON_CALL(*device, GetVendorID()).WillByDefault(Return(0xFFFF));
-  ON_CALL(*device, GetProductID()).WillByDefault(Return(1));
-  ON_CALL(*device, GetDeviceID()).WillByDefault(Return(2));
-
   return device;
 }
 
 // static
 std::unique_ptr<NiceMockBluetoothDevice>
 LayoutTestBluetoothAdapterProvider::GetBatteryDevice(
     MockBluetoothAdapter* adapter) {
   BluetoothDevice::UUIDList uuids;
   uuids.push_back(BluetoothUUID(kBatteryServiceUUID));
 
@@ skipping 410 matching lines @@
   return BluetoothUUID();
 }
 
 // static
 std::string LayoutTestBluetoothAdapterProvider::makeMACAddress(uint64_t addr) {
   return BluetoothDevice::CanonicalizeAddress(
       base::StringPrintf("%012" PRIx64, addr));
 }
 
 }  // namespace content