Bluetooth: clean up BluetoothDevice

device/bluetooth/bluetooth_device_win.h

Index: device/bluetooth/bluetooth_device_win.h
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
index b1e9d805cd23c2a667b5e35e42aacbd115663273..7213cd19b88d2b76f41c106fb582b7f413f66f68 100644
--- a/device/bluetooth/bluetooth_device_win.h
+++ b/device/bluetooth/bluetooth_device_win.h
@@ -22,11 +22,13 @@ class BluetoothDeviceWin : public BluetoothDevice {
       const BluetoothTaskManagerWin::DeviceState& state);
   virtual ~BluetoothDeviceWin();
 
-  void SetVisible(bool visible);
-
   // BluetoothDevice override
+  virtual std::string GetAddress() const OVERRIDE;
   virtual bool IsPaired() const OVERRIDE;
-  virtual const ServiceList& GetServices() const OVERRIDE;
+  virtual bool IsConnected() const OVERRIDE;
+  virtual bool IsConnectable() const OVERRIDE;
+  virtual bool IsConnecting() const OVERRIDE;
+  virtual ServiceList GetServices() const OVERRIDE;
   virtual void GetServiceRecords(
       const ServiceRecordsCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE;
@@ -60,9 +62,18 @@ class BluetoothDeviceWin : public BluetoothDevice {
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
 
+ protected:
+  // BluetoothDevice override
+  virtual uint32 GetBluetoothClass() const OVERRIDE;
+  virtual std::string GetDeviceName() const OVERRIDE;
+
  private:
   friend class BluetoothAdapterWin;
 
+  // Used by BluetoothAdapterWin to update the visible state during
+  // discovery.
+  void SetVisible(bool visible);
+
   // Computes the fingerprint that can be used to compare the devices.
   static uint32 ComputeDeviceFingerprint(
       const BluetoothTaskManagerWin::DeviceState& state);
@@ -71,6 +82,28 @@ class BluetoothDeviceWin : public BluetoothDevice {
     return device_fingerprint_;
   }
 
+  // The Bluetooth class of the device, a bitmask that may be decoded using
+  // https://www.bluetooth.org/Technical/AssignedNumbers/baseband.htm
+  uint32 bluetooth_class_;
+
+  // The name of the device, as supplied by the remote device.
+  std::string name_;
+
+  // The Bluetooth address of the device.
+  std::string address_;
+
+  // Tracked device state, updated by the adapter managing the lifecyle of
+  // the device.
+  bool paired_;
+  bool connected_;
+
+  // Used to send change notifications when a device disappears during
+  // discovery.
+  bool visible_;
+
+  // The services (identified by UUIDs) that this device provides.
+  ServiceList service_uuids_;
+
   // Used to compare the devices.
   uint32 device_fingerprint_;
   ServiceRecordList service_record_list_;