Index: ash/common/system/chromeos/bluetooth/tray_bluetooth.cc |
diff --git a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc |
index c89e4a8e57fb87a925e59def7e08254a6435b43a..436c19499592a799eacbc587d78f031590cedba4 100644 |
--- a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc |
+++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc |
@@ -162,8 +162,7 @@ class BluetoothDefaultView : public TrayItemMore { |
return kSystemMenuBluetoothDisabledIcon; |
bool has_connected_device = false; |
- BluetoothDeviceList list; |
- helper->GetAvailableBluetoothDevices(&list); |
+ BluetoothDeviceList list = helper->GetAvailableBluetoothDevices(); |
for (size_t i = 0; i < list.size(); ++i) { |
if (list[i].connected) { |
has_connected_device = true; |
@@ -234,8 +233,8 @@ class BluetoothDetailedView : public TrayDetailsView { |
std::set<std::string> new_paired_not_connected_devices; |
std::set<std::string> new_discovered_not_paired_devices; |
- BluetoothDeviceList list; |
- Shell::Get()->tray_bluetooth_helper()->GetAvailableBluetoothDevices(&list); |
+ BluetoothDeviceList list = |
+ Shell::Get()->tray_bluetooth_helper()->GetAvailableBluetoothDevices(); |
for (size_t i = 0; i < list.size(); ++i) { |
if (list[i].connecting) { |
new_connecting_devices.insert(list[i].address); |