Update unit tests for BluetoothDevice::GetPrimaryServicesByUUID() etc.

content/browser/bluetooth/web_bluetooth_service_impl.cc

 // 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.
 
 // ID Not In Map Note: A service, characteristic, or descriptor ID not in the
 // corresponding WebBluetoothServiceImpl map [service_id_to_device_address_,
 // characteristic_id_to_service_id_, descriptor_id_to_characteristic_id_]
 // implies a hostile renderer because a renderer obtains the corresponding ID
 // from this class and it will be added to the map at that time.
 
@@ skipping 431 matching lines @@
   }
 
   if (query_result.outcome != CacheQueryOutcome::SUCCESS) {
     RecordGetCharacteristicsOutcome(quantity, query_result.outcome);
     callback.Run(query_result.GetWebResult(),
                  base::nullopt /* characteristics */);
     return;
   }
 
   std::vector<device::BluetoothRemoteGattCharacteristic*> characteristics =
-      characteristics_uuid
-          ? query_result.device->GetCharacteristicsByUUID(
-                service_instance_id, characteristics_uuid.value())
-          : query_result.service->GetCharacteristics();
+      characteristics_uuid ? query_result.service->GetCharacteristicsByUUID(
+                                 characteristics_uuid.value())
+                           : query_result.service->GetCharacteristics();
 
   std::vector<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
       response_characteristics;
   for (device::BluetoothRemoteGattCharacteristic* characteristic :
        characteristics) {
     if (BluetoothBlocklist::Get().IsExcluded(characteristic->GetUUID())) {
       continue;
     }
     std::string characteristic_instance_id = characteristic->GetIdentifier();
     auto insert_result = characteristic_id_to_service_id_.insert(
@@ skipping 56 matching lines @@
   if (query_result.outcome == CacheQueryOutcome::BAD_RENDERER) {
     return;
   }
 
   if (query_result.outcome != CacheQueryOutcome::SUCCESS) {
     RecordGetDescriptorsOutcome(quantity, query_result.outcome);
     callback.Run(query_result.GetWebResult(), base::nullopt /* descriptor */);
     return;
   }
 
-  auto descriptors =
-      descriptors_uuid
-          ? query_result.device->GetDescriptorsByUUID(
-                query_result.characteristic, descriptors_uuid.value())
-          : query_result.characteristic->GetDescriptors();
+  auto descriptors = descriptors_uuid
+                         ? query_result.characteristic->GetDescriptorsByUUID(
+                               descriptors_uuid.value())
+                         : query_result.characteristic->GetDescriptors();
 
   std::vector<blink::mojom::WebBluetoothRemoteGATTDescriptorPtr>
       response_descriptors;
   for (device::BluetoothRemoteGattDescriptor* descriptor : descriptors) {
     if (BluetoothBlocklist::Get().IsExcluded(descriptor->GetUUID())) {
       continue;
     }
     std::string descriptor_instance_id = descriptor->GetIdentifier();
     auto insert_result = descriptor_id_to_characteristic_id_.insert(
         {descriptor_instance_id, characteristic_instance_id});
@@ skipping 640 matching lines @@
   descriptor_id_to_characteristic_id_.clear();
   characteristic_id_to_service_id_.clear();
   service_id_to_device_address_.clear();
   connected_devices_.reset(
       new FrameConnectedBluetoothDevices(render_frame_host_));
   device_chooser_controller_.reset();
   BluetoothAdapterFactoryWrapper::Get().ReleaseAdapter(this);
 }
 
 }  // namespace content