Bluetooth: clean up BluetoothDevice

device/bluetooth/bluetooth_device_win.cc

 // Copyright (c) 2012 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 "device/bluetooth/bluetooth_device_win.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash.h"
@@ skipping 13 matching lines @@
 
 namespace device {
 
 BluetoothDeviceWin::BluetoothDeviceWin(
     const BluetoothTaskManagerWin::DeviceState& state)
     : BluetoothDevice(), device_fingerprint_(ComputeDeviceFingerprint(state)) {
   name_ = state.name;
   address_ = state.address;
   bluetooth_class_ = state.bluetooth_class;
   connected_ = state.connected;
-  bonded_ = state.authenticated;
+  paired_ = state.authenticated;
 
   for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
        iter = state.service_record_states.begin();
        iter != state.service_record_states.end();
        ++iter) {
     uint8 sdp_bytes_buffer[kSdpBytesBufferSize];
     std::copy((*iter)->sdp_bytes.begin(),
               (*iter)->sdp_bytes.end(),
               sdp_bytes_buffer);
     BluetoothServiceRecord* service_record = new BluetoothServiceRecordWin(
         (*iter)->name,
         (*iter)->address,
         (*iter)->sdp_bytes.size(),
         sdp_bytes_buffer);
     service_record_list_.push_back(service_record);
     service_uuids_.push_back(service_record->uuid());
   }
 }
 
 BluetoothDeviceWin::~BluetoothDeviceWin() {
 }
 
-void BluetoothDeviceWin::SetVisible(bool visible) {
-  visible_ = visible;
+uint32 BluetoothDeviceWin::bluetooth_class() const {
+  return bluetooth_class_;
+}
+
+std::string BluetoothDeviceWin::name() const {
+  return name_;
+}
+
+std::string BluetoothDeviceWin::address() const {
+  return address_;
 }
 
 bool BluetoothDeviceWin::IsPaired() const {
+  return paired_;
+}
+
+bool BluetoothDeviceWin::IsConnected() const {
+  return connected_;
+}
+
+bool BluetoothDeviceWin::IsConnectable() const {
   return false;
 }
 
-const BluetoothDevice::ServiceList& BluetoothDeviceWin::GetServices() const {
+bool BluetoothDeviceWin::IsConnecting() const {
+  return false;
+}
+
+BluetoothDevice::ServiceList BluetoothDeviceWin::GetServices() const {
   return service_uuids_;
 }
 
 void BluetoothDeviceWin::GetServiceRecords(
     const ServiceRecordsCallback& callback,
     const ErrorCallback& error_callback) {
   callback.Run(service_record_list_);
 }
 
 void BluetoothDeviceWin::ProvidesServiceWithName(
@@ skipping 93 matching lines @@
   NOTIMPLEMENTED();
 }
 
 // static
 uint32 BluetoothDeviceWin::ComputeDeviceFingerprint(
     const BluetoothTaskManagerWin::DeviceState& state) {
   std::string device_string = base::StringPrintf("%s%s%u%s%s%s",
       state.name.c_str(),
       state.address.c_str(),
       state.bluetooth_class,
-      state.visible ? "true" : "false",
       state.connected ? "true" : "false",
       state.authenticated ? "true" : "false");
   for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
       iter = state.service_record_states.begin();
       iter != state.service_record_states.end();
       ++iter) {
     base::StringAppendF(&device_string,
                         "%s%s%d",
                         (*iter)->name.c_str(),
                         (*iter)->address.c_str(),
                         (*iter)->sdp_bytes.size());
   }
   return base::Hash(device_string);
 }
 
 }  // namespace device