bluetooth: web: web_bluetooth.mojom comments and UUID type fix.

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 473 matching lines @@
     std::string characteristic_instance_id = characteristic->GetIdentifier();
     auto insert_result = characteristic_id_to_service_id_.insert(
         std::make_pair(characteristic_instance_id, service_instance_id));
     // If value is already in map, DCHECK it's valid.
     if (!insert_result.second)
       DCHECK(insert_result.first->second == service_instance_id);
 
     blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr characteristic_ptr =
         blink::mojom::WebBluetoothRemoteGATTCharacteristic::New();
     characteristic_ptr->instance_id = characteristic_instance_id;
-    characteristic_ptr->uuid = characteristic->GetUUID().canonical_value();
+    characteristic_ptr->uuid = characteristic->GetUUID();
     characteristic_ptr->properties =
         static_cast<uint32_t>(characteristic->GetProperties());
     response_characteristics.push_back(std::move(characteristic_ptr));
 
     if (quantity == blink::mojom::WebBluetoothGATTQueryQuantity::SINGLE) {
       break;
     }
   }
 
   if (!response_characteristics.empty()) {
@@ skipping 53 matching lines @@
     }
     std::string descriptor_instance_id = descriptor->GetIdentifier();
     auto insert_result = descriptor_id_to_characteristic_id_.insert(
         {descriptor_instance_id, characteristic_instance_id});
     // If value is already in map, DCHECK it's valid.
     if (!insert_result.second)
       DCHECK(insert_result.first->second == characteristic_instance_id);
 
     auto descriptor_ptr(blink::mojom::WebBluetoothRemoteGATTDescriptor::New());
     descriptor_ptr->instance_id = descriptor_instance_id;
-    descriptor_ptr->uuid = descriptor->GetUUID().canonical_value();
+    descriptor_ptr->uuid = descriptor->GetUUID();
     response_descriptors.push_back(std::move(descriptor_ptr));
 
     if (quantity == blink::mojom::WebBluetoothGATTQueryQuantity::SINGLE) {
       break;
     }
   }
 
   if (!response_descriptors.empty()) {
     callback.Run(blink::mojom::WebBluetoothResult::SUCCESS,
                  std::move(response_descriptors));
@@ skipping 203 matching lines @@
     const std::string& device_address = device->GetAddress();
     auto insert_result = service_id_to_device_address_.insert(
         make_pair(service_instance_id, device_address));
     // If value is already in map, DCHECK it's valid.
     if (!insert_result.second)
       DCHECK_EQ(insert_result.first->second, device_address);
 
     blink::mojom::WebBluetoothRemoteGATTServicePtr service_ptr =
         blink::mojom::WebBluetoothRemoteGATTService::New();
     service_ptr->instance_id = service_instance_id;
-    service_ptr->uuid = service->GetUUID().canonical_value();
+    service_ptr->uuid = service->GetUUID();
     response_services.push_back(std::move(service_ptr));
 
     if (quantity == blink::mojom::WebBluetoothGATTQueryQuantity::SINGLE) {
       break;
     }
   }
 
   if (!response_services.empty()) {
     DVLOG(1) << "Services found in device.";
     RecordGetPrimaryServicesOutcome(quantity,
@@ skipping 242 matching lines @@
   characteristic_id_to_service_id_.clear();
   service_id_to_device_address_.clear();
   connected_devices_.reset(
       new FrameConnectedBluetoothDevices(render_frame_host_));
   allowed_devices_map_ = BluetoothAllowedDevicesMap();
   device_chooser_controller_.reset();
   BluetoothAdapterFactoryWrapper::Get().ReleaseAdapter(this);
 }
 
 }  // namespace content