bluetooth: Use BluetoothUUID instead of string when sending uuids

content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc

 // Copyright 2015 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 "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
 
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using device::BluetoothUUID;
 
 namespace content {
 namespace {
 const url::Origin kTestOrigin1(GURL("https://www.example1.com"));
 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:
   BluetoothAllowedDevicesMapTest() {
     empty_options_ = blink::mojom::WebBluetoothRequestDeviceOptions::New();
   }
 
   ~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_;
 };
 
 }  // namespace
 
 TEST_F(BluetoothAllowedDevicesMapTest, UniqueOriginNotSupported) {
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   EXPECT_DEATH_IF_SUPPORTED(allowed_devices_map.AddDevice(
                                 url::Origin(), kDeviceAddress1, empty_options_),
@@ skipping 130 matching lines @@
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   // Setup device.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   blink::mojom::WebBluetoothScanFilterPtr scanFilter1 =
       blink::mojom::WebBluetoothScanFilter::New();
   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 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options);
 
   // Access allowed services.
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kGlucoseUUID));
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kHeartRateUUID));
@@ skipping 45 matching lines @@
 
 TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginTwoDevices) {
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   // Setup request for device #1.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options1 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   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 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   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 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
   const std::string& device_id2 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress2, options2);
 
   // Access allowed services.
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kGlucoseUUID));
@@ skipping 22 matching lines @@
 }
 
 TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_TwoOriginsOneDevice) {
   BluetoothAllowedDevicesMap allowed_devices_map;
   // Setup request #1 for device.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options1 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   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 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   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 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
   const std::string& device_id2 =
       allowed_devices_map.AddDevice(kTestOrigin2, kDeviceAddress1, options2);
 
   // Access allowed services.
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kGlucoseUUID));
@@ skipping 37 matching lines @@
 
 TEST_F(BluetoothAllowedDevicesMapTest, MergeServices) {
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   // Setup first request.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options1 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   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 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
 
   // Setup second request.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
   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 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options2);
 
   EXPECT_EQ(device_id1, device_id2);
 
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kGlucoseUUID));
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
@@ skipping 10 matching lines @@
   const std::string& device_id = allowed_devices_map.AddDevice(
       kTestOrigin1, kDeviceAddress1, empty_options_);
 
   EXPECT_TRUE(device_id.size() == 24)
       << "Expected Lenghth of a 128bit string encoded to Base64.";
   EXPECT_TRUE((device_id[22] == '=') && (device_id[23] == '='))
       << "Expected padding characters for a 128bit string encoded to Base64.";
 }
 
 }  // namespace content