Move some functions from web_bluetooth_service_impl.cc to BluetoothDevice class

device/bluetooth/bluetooth_device.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.h"
 
 #include <iterator>
 #include <memory>
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "device/bluetooth/string_util_icu.h"
 #include "grit/bluetooth_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace device {
 
 BluetoothDevice::DeviceUUIDs::DeviceUUIDs() = default;
 
 BluetoothDevice::DeviceUUIDs::~DeviceUUIDs() = default;
@@ skipping 414 matching lines @@
 }
 
 void BluetoothDevice::ClearAdvertisementData() {
   inquiry_rssi_ = base::nullopt;
   device_uuids_.ClearAdvertisedUUIDs();
   service_data_.clear();
   inquiry_tx_power_ = base::nullopt;
   GetAdapter()->NotifyDeviceChanged(this);
 }
 
+std::vector<BluetoothRemoteGattCharacteristic*>
+BluetoothDevice::GetCharacteristicsByUUID(
+    const std::string& service_instance_id,
+    const BluetoothUUID& characteristic_uuid) {
+  std::vector<BluetoothRemoteGattCharacteristic*> characteristics;
+  VLOG(1) << "Looking for characteristic: "

[scheib, 2017/01/07 01:42:36]

Change these VLOGs to be VLOG(2). Now that we're in device/bluetooth they will
be more spammy compared to when they were only in the web bluetooth code.

[juncai, 2017/01/09 19:29:19]

Done.

+          << characteristic_uuid.canonical_value();
+  BluetoothRemoteGattService* service = GetGattService(service_instance_id);
+  if (service) {
+    for (BluetoothRemoteGattCharacteristic* characteristic :
+         service->GetCharacteristics()) {
+      VLOG(1) << "Characteristic in cache: "
+              << characteristic->GetUUID().canonical_value();
+      if (characteristic->GetUUID() == characteristic_uuid) {
+        characteristics.push_back(characteristic);
+      }
+    }
+  }
+  return characteristics;
+}
+
+std::vector<BluetoothRemoteGattService*>
+BluetoothDevice::GetPrimaryServicesByUUID(const BluetoothUUID& service_uuid) {
+  std::vector<BluetoothRemoteGattService*> services;
+  VLOG(1) << "Looking for service: " << service_uuid.canonical_value();
+  for (BluetoothRemoteGattService* service : GetGattServices()) {
+    VLOG(1) << "Service in cache: " << service->GetUUID().canonical_value();
+    if (service->GetUUID() == service_uuid && service->IsPrimary()) {
+      services.push_back(service);
+    }
+  }
+  return services;
+}
+
+std::vector<BluetoothRemoteGattService*> BluetoothDevice::GetPrimaryServices() {
+  std::vector<BluetoothRemoteGattService*> services;
+  VLOG(1) << "Looking for services.";
+  for (BluetoothRemoteGattService* service : GetGattServices()) {
+    VLOG(1) << "Service in cache: " << service->GetUUID().canonical_value();
+    if (service->IsPrimary()) {
+      services.push_back(service);
+    }
+  }
+  return services;
+}
+
 void BluetoothDevice::DidConnectGatt() {
   for (const auto& callback : create_gatt_connection_success_callbacks_) {
     callback.Run(
         base::MakeUnique<BluetoothGattConnection>(adapter_, GetAddress()));
   }
   create_gatt_connection_success_callbacks_.clear();
   create_gatt_connection_error_callbacks_.clear();
   GetAdapter()->NotifyDeviceChanged(this);
 }
 
@@ skipping 59 matching lines @@
   if (power < INT8_MIN) {
     return INT8_MIN;
   }
   if (power > INT8_MAX) {
     return INT8_MAX;
   }
   return static_cast<int8_t>(power);
 }
 
 }  // namespace device