bluetooth: Use BluetoothUUID instead of string when sending uuids

content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc

Index: content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
diff --git a/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc b/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
index eab3493fa4ca6be7d17cdd5ec6cd8fe8fdecd8ab..337782bbac23f633b82a60756aca875a8feaf467 100644
--- a/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
+++ b/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
@@ -18,11 +18,16 @@ const url::Origin kTestOrigin2(GURL("https://www.example2.com"));
 const std::string kDeviceAddress1 = "00:00:00";
 const std::string kDeviceAddress2 = "11:11:11";
 
-const char kGlucoseUUID[] = "00001808-0000-1000-8000-00805f9b34fb";
-const char kHeartRateUUID[] = "0000180d-0000-1000-8000-00805f9b34fb";
-const char kBatteryServiceUUID[] = "0000180f-0000-1000-8000-00805f9b34fb";
-const char kBloodPressureUUID[] = "00001813-0000-1000-8000-00805f9b34fb";
-const char kCyclingPowerUUID[] = "00001818-0000-1000-8000-00805f9b34fb";
+const char kGlucoseUUIDString[] = "00001808-0000-1000-8000-00805f9b34fb";
+const char kHeartRateUUIDString[] = "0000180d-0000-1000-8000-00805f9b34fb";
+const char kBatteryServiceUUIDString[] = "0000180f-0000-1000-8000-00805f9b34fb";
+const char kBloodPressureUUIDString[] = "00001813-0000-1000-8000-00805f9b34fb";
+const char kCyclingPowerUUIDString[] = "00001818-0000-1000-8000-00805f9b34fb";
+const BluetoothUUID kGlucoseUUID(kGlucoseUUIDString);
+const BluetoothUUID kHeartRateUUID(kHeartRateUUIDString);
+const BluetoothUUID kBatteryServiceUUID(kBatteryServiceUUIDString);
+const BluetoothUUID kBloodPressureUUID(kBloodPressureUUIDString);
+const BluetoothUUID kCyclingPowerUUID(kCyclingPowerUUIDString);
 
 class BluetoothAllowedDevicesMapTest : public testing::Test {
  protected:
@@ -32,6 +37,22 @@ class BluetoothAllowedDevicesMapTest : public testing::Test {
 
   ~BluetoothAllowedDevicesMapTest() override {}
 
+  base::Optional<BluetoothUUID> GetGlucoseUUIDOpt() {
+    return base::make_optional(BluetoothUUID(kGlucoseUUID));
+  }
+  base::Optional<BluetoothUUID> GetHeartRateUUIDOpt() {
+    return base::make_optional(BluetoothUUID(kHeartRateUUID));

[Jeffrey Yasskin, 2016/05/31 21:52:57]

You can drop the BluetoothUUID() copy constructor calls now. Because
Optional<T>(const T&) is implicit, you can even drop the make_optional() calls,
but I'm happy keeping those.

Because GetHeartRateUUIDOpt() is just replacing
base::make_optional(kHeartRateUUID), would it make sense to use that call
directly at the call sites instead of having these wrapper functions? You can
even 'using' away the 'base::'. (That's not necessarily the right thing to do,
but it's worth considering.)

[ortuno, 2016/06/01 15:37:58]

Done. I also removed base::make_optional since the only reason we use an
optional type there, is that mojo doesn't yet support two different types for
nullable and non-nullable.

+  }
+  base::Optional<BluetoothUUID> GetBatteryServiceUUIDOpt() {
+    return base::make_optional(BluetoothUUID(kBatteryServiceUUID));
+  }
+  base::Optional<BluetoothUUID> GetBloodPressureUUIDOpt() {
+    return base::make_optional(BluetoothUUID(kBloodPressureUUID));
+  }
+  base::Optional<BluetoothUUID> GetCyclingPowerUUIDOpt() {
+    return base::make_optional(BluetoothUUID(kCyclingPowerUUID));
+  }
+
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr empty_options_;
 };
 
@@ -182,14 +203,14 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginOneDevice) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
+  scanFilter1->services.push_back(GetGlucoseUUIDOpt());
   options->filters.push_back(scanFilter1.Clone());
 
-  scanFilter2->services.push_back(kHeartRateUUID);
+  scanFilter2->services.push_back(GetHeartRateUUIDOpt());
   options->filters.push_back(scanFilter2.Clone());
 
-  options->optional_services.push_back(kBatteryServiceUUID);
-  options->optional_services.push_back(kHeartRateUUID);
+  options->optional_services.push_back(GetBatteryServiceUUIDOpt());
+  options->optional_services.push_back(GetHeartRateUUIDOpt());
 
   // Add to map.
   const std::string device_id1 =
@@ -255,10 +276,10 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginTwoDevices) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter1 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
+  scanFilter1->services.push_back(GetGlucoseUUIDOpt());
   options1->filters.push_back(std::move(scanFilter1));
 
-  options1->optional_services.push_back(kHeartRateUUID);
+  options1->optional_services.push_back(GetHeartRateUUIDOpt());
 
   // Setup request for device #2.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
@@ -266,10 +287,10 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginTwoDevices) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter2->services.push_back(kBatteryServiceUUID);
+  scanFilter2->services.push_back(GetBatteryServiceUUIDOpt());
   options2->filters.push_back(std::move(scanFilter2));
 
-  options2->optional_services.push_back(kBloodPressureUUID);
+  options2->optional_services.push_back(GetBloodPressureUUIDOpt());
 
   // Add devices to map.
   const std::string& device_id1 =
@@ -312,10 +333,10 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_TwoOriginsOneDevice) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter1 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
+  scanFilter1->services.push_back(GetGlucoseUUIDOpt());
   options1->filters.push_back(std::move(scanFilter1));
 
-  options1->optional_services.push_back(kHeartRateUUID);
+  options1->optional_services.push_back(GetHeartRateUUIDOpt());
 
   // Setup request #2 for device.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
@@ -323,10 +344,10 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_TwoOriginsOneDevice) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter2->services.push_back(kBatteryServiceUUID);
+  scanFilter2->services.push_back(GetBatteryServiceUUIDOpt());
   options2->filters.push_back(std::move(scanFilter2));
 
-  options2->optional_services.push_back(kBloodPressureUUID);
+  options2->optional_services.push_back(GetBloodPressureUUIDOpt());
 
   // Add devices to map.
   const std::string& device_id1 =
@@ -384,10 +405,10 @@ TEST_F(BluetoothAllowedDevicesMapTest, MergeServices) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter1 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
+  scanFilter1->services.push_back(GetGlucoseUUIDOpt());
   options1->filters.push_back(std::move(scanFilter1));
 
-  options1->optional_services.push_back(kBatteryServiceUUID);
+  options1->optional_services.push_back(GetBatteryServiceUUIDOpt());
 
   // Add to map.
   const std::string device_id1 =
@@ -399,10 +420,10 @@ TEST_F(BluetoothAllowedDevicesMapTest, MergeServices) {
   blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
       blink::mojom::WebBluetoothScanFilter::New();
 
-  scanFilter2->services.push_back(kHeartRateUUID);
+  scanFilter2->services.push_back(GetHeartRateUUIDOpt());
   options2->filters.push_back(std::move(scanFilter2));
 
-  options2->optional_services.push_back(kBloodPressureUUID);
+  options2->optional_services.push_back(GetBloodPressureUUIDOpt());
 
   // Add to map again.
   const std::string device_id2 =