Bluetooth: clean up BluetoothDevice

chrome/browser/extensions/api/bluetooth/bluetooth_event_router.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/extensions/api/bluetooth/bluetooth_event_router.h"
 
 #include <map>
 #include <string>
 
 #include "base/json/json_writer.h"
@@ skipping 116 matching lines @@
     const char* event_name, const extensions::api::bluetooth::Device& device) {
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(device.ToValue().release());
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
   ExtensionSystem::Get(profile_)->event_router()->BroadcastEvent(event.Pass());
 }
 
 void ExtensionBluetoothEventRouter::AdapterPresentChanged(
     device::BluetoothAdapter* adapter, bool present) {
   if (adapter != adapter_) {
-    DVLOG(1) << "Ignoring event for adapter " << adapter->address();
+    DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
   DispatchAdapterStateEvent();
 }
 
 void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
     device::BluetoothAdapter* adapter, bool has_power) {
   if (adapter != adapter_) {
-    DVLOG(1) << "Ignoring event for adapter " << adapter->address();
+    DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
   DispatchAdapterStateEvent();
 }
 
 void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
     device::BluetoothAdapter* adapter, bool discovering) {
   if (adapter != adapter_) {
-    DVLOG(1) << "Ignoring event for adapter " << adapter->address();
+    DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
 
   if (!discovering) {
     send_discovery_events_ = false;
     responsible_for_discovery_ = false;
     discovered_devices_.clear();
   }
 
   DispatchAdapterStateEvent();
 }
 
 void ExtensionBluetoothEventRouter::DeviceAdded(
     device::BluetoothAdapter* adapter,
     device::BluetoothDevice* device) {
   if (adapter != adapter_) {
-    DVLOG(1) << "Ignoring event for adapter " << adapter->address();
+    DVLOG(1) << "Ignoring event for adapter " << adapter->GetAddress();
     return;
   }
 
   extensions::api::bluetooth::Device* extension_device =
       new extensions::api::bluetooth::Device();
   extensions::api::bluetooth::BluetoothDeviceToApiDevice(
       *device, extension_device);
   discovered_devices_.push_back(extension_device);
 
   if (!send_discovery_events_)
@@ skipping 31 matching lines @@
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(state.ToValue().release());
   scoped_ptr<Event> event(new Event(
       extensions::event_names::kBluetoothOnAdapterStateChanged,
       args.Pass()));
   ExtensionSystem::Get(profile_)->event_router()->BroadcastEvent(event.Pass());
 }
 
 }  // namespace extensions