Bluetooth: clean up BluetoothDevice

chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.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 "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 278 matching lines @@
                      << ": " << auth_token;
       }
     } else {
       // Connection request.
       VLOG(1) << "Connect: " << address;
       device->Connect(
           this,
           base::Bind(&base::DoNothing),
           base::Bind(&BluetoothOptionsHandler::ConnectError,
                      weak_ptr_factory_.GetWeakPtr(),
-                     device->address()));
+                     device->GetAddress()));
     }
   } else if (command == kCancelCommand) {
     // Cancel pairing.
     VLOG(1) << "Cancel pairing: " << address;
     device->CancelPairing();
   } else if (command == kAcceptCommand) {
     // Confirm displayed Passkey.
     VLOG(1) << "Confirm pairing: " << address;
     device->ConfirmPairing();
   } else if (command == kRejectCommand) {
     // Reject displayed Passkey.
     VLOG(1) << "Reject pairing: " << address;
     device->RejectPairing();
   } else if (command == kDisconnectCommand) {
     // Disconnect from device.
     VLOG(1) << "Disconnect device: " << address;
     device->Disconnect(
         base::Bind(&base::DoNothing),
         base::Bind(&BluetoothOptionsHandler::DisconnectError,
                    weak_ptr_factory_.GetWeakPtr(),
-                   device->address()));
+                   device->GetAddress()));
   } else if (command == kForgetCommand) {
     // Disconnect from device and delete pairing information.
     VLOG(1) << "Forget device: " << address;
     device->Forget(base::Bind(&BluetoothOptionsHandler::ForgetError,
                               weak_ptr_factory_.GetWeakPtr(),
-                              device->address()));
+                              device->GetAddress()));
   } else {
     LOG(WARNING) << "Unknown updateBluetoothDevice command: " << command;
   }
 }
 
 void BluetoothOptionsHandler::ConnectError(
     const std::string& address,
     device::BluetoothDevice::ConnectErrorCode error_code) {
   const char* error_name = NULL;
 
@@ skipping 62 matching lines @@
   for (device::BluetoothAdapter::DeviceList::iterator iter = devices.begin();
        iter != devices.end(); ++iter)
     SendDeviceNotification(*iter, NULL);
 }
 
 void BluetoothOptionsHandler::SendDeviceNotification(
     const device::BluetoothDevice* device,
     base::DictionaryValue* params) {
   base::DictionaryValue js_properties;
   js_properties.SetString("name", device->GetName());
-  js_properties.SetString("address", device->address());
+  js_properties.SetString("address", device->GetAddress());
   js_properties.SetBoolean("paired", device->IsPaired());
-  js_properties.SetBoolean("bonded", device->IsBonded());
   js_properties.SetBoolean("connected", device->IsConnected());
   js_properties.SetBoolean("connectable", device->IsConnectable());
   if (params)
     js_properties.MergeDictionary(params);
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.addBluetoothDevice",
       js_properties);
 }
 
 void BluetoothOptionsHandler::RequestPinCode(device::BluetoothDevice* device) {
@@ skipping 60 matching lines @@
   DCHECK(adapter == adapter_.get());
   DCHECK(device);
   SendDeviceNotification(device, NULL);
 }
 
 void BluetoothOptionsHandler::DeviceRemoved(device::BluetoothAdapter* adapter,
                                             device::BluetoothDevice* device) {
   DCHECK(adapter == adapter_.get());
   DCHECK(device);
 
-  base::StringValue address(device->address());
+  base::StringValue address(device->GetAddress());
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.removeBluetoothDevice",
       address);
 }
 
 void BluetoothOptionsHandler::DeviceConnecting(
     device::BluetoothDevice* device) {
   DCHECK(device);
   DictionaryValue params;
   params.SetString("pairing", kStartConnecting);
   SendDeviceNotification(device, &params);
 }
 
 }  // namespace options
 }  // namespace chromeos