bluetooth: Add device list retrieval for chrome://bluetooth-internals

chrome/browser/ui/webui/bluetooth_internals/services/bluetooth_adapter_service.cc

Index: chrome/browser/ui/webui/bluetooth_internals/services/bluetooth_adapter_service.cc
diff --git a/chrome/browser/ui/webui/bluetooth_internals/services/bluetooth_adapter_service.cc b/chrome/browser/ui/webui/bluetooth_internals/services/bluetooth_adapter_service.cc
new file mode 100644
index 0000000000000000000000000000000000000000..942b9b6a620a97012a0172a3c2ba16d63086d152
--- /dev/null
+++ b/chrome/browser/ui/webui/bluetooth_internals/services/bluetooth_adapter_service.cc
@@ -0,0 +1,104 @@
+// Copyright 2016 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 <utility>
+#include <vector>
+
+#include "chrome/browser/ui/webui/bluetooth_internals/services/bluetooth_adapter_service.h"
+#include "mojo/public/cpp/bindings/string.h"
+
+BluetoothAdapterService::BluetoothAdapterService(
+    bluetooth::mojom::AdapterClientPtr client)
+    : client_(std::move(client)), weak_ptr_factory_(this) {}
+
+BluetoothAdapterService::~BluetoothAdapterService() {
+  if (adapter_.get()) {
+    adapter_->RemoveObserver(this);
+    adapter_ = nullptr;
+  }
+}
+
+void BluetoothAdapterService::OnGetAdapter(
+    scoped_refptr<device::BluetoothAdapter> adapter) {
+  if (!adapter_.get()) {
+    VLOG(1) << "Adapter acquired in BluetoothAdapterService";
+    adapter_ = adapter;
+    adapter_->AddObserver(this);
+  }
+}
+
+void BluetoothAdapterService::GetDevices(const GetDevicesCallback& callback) {
+  if (!GetAdapter().get()) {
+    if (device::BluetoothAdapterFactory::IsBluetoothAdapterAvailable()) {
+      device::BluetoothAdapterFactory::GetAdapter(
+          base::Bind(&BluetoothAdapterService::GetDevicesImpl,
+                     weak_ptr_factory_.GetWeakPtr(), callback));
+      return;
+    }
+    callback.Run(std::vector<bluetooth::mojom::DeviceInfoPtr>());
+    return;
+  }
+  GetDevicesImpl(callback, GetAdapter());
+}
+
+void BluetoothAdapterService::GetDevicesImpl(
+    const GetDevicesCallback& callback,
+    scoped_refptr<device::BluetoothAdapter> adapter) {
+  OnGetAdapter(adapter);
+  std::vector<bluetooth::mojom::DeviceInfoPtr> devices;
+
+  for (const device::BluetoothDevice* device : adapter->GetDevices()) {
+    addresses_.insert(device->GetAddress());
+  }
+
+  for (const std::string& address : addresses_) {
+    device::BluetoothDevice* device = adapter->GetDevice(address);
+    bluetooth::mojom::DeviceInfoPtr device_info =
+        ConstructDeviceInfoStruct(device);
+    devices.push_back(std::move(device_info));
+  }
+
+  callback.Run(std::move(devices));
+}
+
+scoped_refptr<device::BluetoothAdapter> BluetoothAdapterService::GetAdapter() {
+  return adapter_;
+}
+
+void BluetoothAdapterService::DeviceAdded(device::BluetoothAdapter* adapter,
+                                          device::BluetoothDevice* device) {
+  std::string device_address = device->GetAddress();
+
+  // If unknown address was added, alert client
+  if (addresses_.insert(device_address).second && client_) {

[scheib, 2016/09/26 19:37:27]

Do we need this logic here? Why not pass through the DeviceAdded call without
logic, and without saving to addresses_ (remove that member variable).

[mbrunson, 2016/09/28 02:18:22]

Done.

+    auto device_info = ConstructDeviceInfoStruct(device);
+    client_->DeviceAdded(std::move(device_info));
+  }
+}
+
+void BluetoothAdapterService::DeviceRemoved(device::BluetoothAdapter* adapter,
+                                            device::BluetoothDevice* device) {
+  std::string device_address = device->GetAddress();
+
+  // If known address was removed, alert client
+  if (addresses_.erase(device_address) && client_) {
+    auto device_info = ConstructDeviceInfoStruct(device);
+    client_->DeviceRemoved(std::move(device_info));
+  }
+}
+
+bluetooth::mojom::DeviceInfoPtr
+BluetoothAdapterService::ConstructDeviceInfoStruct(
+    device::BluetoothDevice* device) {
+  bluetooth::mojom::DeviceInfoPtr device_info =
+      bluetooth::mojom::DeviceInfo::New();
+
+  device_info->name = device->GetName();
+  device_info->name_for_display =
+      base::UTF16ToUTF8(device->GetNameForDisplay());
+  device_info->id = device->GetIdentifier();
+  device_info->address = device->GetAddress();
+
+  return device_info;
+}