bluetooth: Use BluetoothUUID instead of string when sending uuids

content/browser/bluetooth/bluetooth_blacklist_unittest.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.
 
 #include "content/browser/bluetooth/bluetooth_blacklist.h"
 
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using device::BluetoothUUID;
 
 namespace content {
 
 namespace {
 
-std::string Canonicalize(const std::string& string) {
-  return device::BluetoothUUID(string).canonical_value();
+base::Optional<BluetoothUUID> Canonicalize(const std::string& str) {
+  return base::make_optional(device::BluetoothUUID(str));
 }
 
 }  // namespace
 
 class BluetoothBlacklistTest : public ::testing::Test {
  public:
   BluetoothBlacklistTest() : list_(BluetoothBlacklist::Get()) {
     // Because BluetoothBlacklist is used via a singleton instance, the data
     // must be reset for each test.
     list_.ResetToDefaultValuesForTest();
@@ skipping 197 matching lines @@
   list_.Add(BluetoothUUID("ee01"), BluetoothBlacklist::Value::EXCLUDE_READS);
   list_.Add(BluetoothUUID("ee02"), BluetoothBlacklist::Value::EXCLUDE_WRITES);
   {
     mojo::Array<blink::mojom::WebBluetoothScanFilterPtr> empty_filters;
     EXPECT_FALSE(list_.IsExcluded(empty_filters));
   }
   {
     mojo::Array<blink::mojom::WebBluetoothScanFilterPtr> single_empty_filter(1);
 
     single_empty_filter[0] = blink::mojom::WebBluetoothScanFilter::New();
-    single_empty_filter[0]->services = mojo::Array<mojo::String>();
+    single_empty_filter[0]->services =
+        mojo::Array<base::Optional<BluetoothUUID>>();
 
     EXPECT_EQ(0u, single_empty_filter[0]->services.size());
     EXPECT_FALSE(list_.IsExcluded(single_empty_filter));
   }
   {
     mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>
         single_non_matching_filter(1);
 
     single_non_matching_filter[0] = blink::mojom::WebBluetoothScanFilter::New();
     single_non_matching_filter[0]->services.push_back(Canonicalize("0000"));
@@ skipping 76 matching lines @@
 TEST_F(BluetoothBlacklistTest, RemoveExcludedUUIDs_NonMatching) {
   list_.Add(BluetoothUUID("eeee"), BluetoothBlacklist::Value::EXCLUDE);
   list_.Add(BluetoothUUID("ee01"), BluetoothBlacklist::Value::EXCLUDE_READS);
   list_.Add(BluetoothUUID("ee02"), BluetoothBlacklist::Value::EXCLUDE_WRITES);
 
   // options.optional_services should be the same before and after
   // RemoveExcludedUUIDs().
   {
     // Empty optional_services.
     blink::mojom::WebBluetoothRequestDeviceOptions options;
-    options.optional_services = mojo::Array<mojo::String>();
+    options.optional_services = mojo::Array<base::Optional<BluetoothUUID>>();
 
-    mojo::Array<mojo::String> expected = options.optional_services.Clone();
+    mojo::Array<base::Optional<BluetoothUUID>> expected =
+        options.optional_services.Clone();
 
     list_.RemoveExcludedUUIDs(&options);
     EXPECT_TRUE(options.optional_services.Equals(expected));
   }
   {
     // One non-matching service in optional_services.
     blink::mojom::WebBluetoothRequestDeviceOptions options;
     options.optional_services.push_back(Canonicalize("0000"));
 
-    mojo::Array<mojo::String> expected = options.optional_services.Clone();
+    mojo::Array<base::Optional<BluetoothUUID>> expected =
+        options.optional_services.Clone();
 
     list_.RemoveExcludedUUIDs(&options);
     EXPECT_TRUE(options.optional_services.Equals(expected));
   }
   {
     // Multiple non-matching services in optional_services.
     blink::mojom::WebBluetoothRequestDeviceOptions options;
     options.optional_services.push_back(Canonicalize("0000"));
     options.optional_services.push_back(Canonicalize("ee01"));
     options.optional_services.push_back(Canonicalize("ee02"));
     options.optional_services.push_back(Canonicalize("0003"));
 
-    mojo::Array<mojo::String> expected = options.optional_services.Clone();
+    mojo::Array<base::Optional<BluetoothUUID>> expected =
+        options.optional_services.Clone();
 
     list_.RemoveExcludedUUIDs(&options);
     EXPECT_TRUE(options.optional_services.Equals(expected));
   }
 }
 
 TEST_F(BluetoothBlacklistTest, RemoveExcludedUuids_Matching) {
   list_.Add(BluetoothUUID("eeee"), BluetoothBlacklist::Value::EXCLUDE);
   list_.Add(BluetoothUUID("eee2"), BluetoothBlacklist::Value::EXCLUDE);
   list_.Add(BluetoothUUID("eee3"), BluetoothBlacklist::Value::EXCLUDE);
   list_.Add(BluetoothUUID("eee4"), BluetoothBlacklist::Value::EXCLUDE);
   {
     // Single matching service in optional_services.
     blink::mojom::WebBluetoothRequestDeviceOptions options;
     options.optional_services.push_back(Canonicalize("eeee"));
 
-    mojo::Array<mojo::String> expected = mojo::Array<mojo::String>();
+    mojo::Array<base::Optional<BluetoothUUID>> expected =
+        mojo::Array<base::Optional<BluetoothUUID>>();

[jbroman, 2016/06/08 21:08:07]

nit: Not added in this CL, but you could just default-construct here (and
elsewhere in this file):

mojo::Array<base::optional<BluetoothUUID>> expected;

[ortuno, 2016/06/09 16:15:59]

Done.

 
     list_.RemoveExcludedUUIDs(&options);
 
     EXPECT_TRUE(options.optional_services.Equals(expected));
   }
   {
     // Single matching of many services in optional_services.
     blink::mojom::WebBluetoothRequestDeviceOptions options;
     options.optional_services.push_back(Canonicalize("0000"));
     options.optional_services.push_back(Canonicalize("eeee"));
     options.optional_services.push_back(Canonicalize("0001"));
 
-    mojo::Array<mojo::String> expected;
+    mojo::Array<base::Optional<BluetoothUUID>> expected;
     expected.push_back(Canonicalize("0000"));
     expected.push_back(Canonicalize("0001"));
 
     list_.RemoveExcludedUUIDs(&options);
     EXPECT_TRUE(options.optional_services.Equals(expected));
   }
   {
     // All matching of many services in optional_services.
     blink::mojom::WebBluetoothRequestDeviceOptions options;
     options.optional_services.push_back(Canonicalize("eee2"));
     options.optional_services.push_back(Canonicalize("eee4"));
     options.optional_services.push_back(Canonicalize("eee3"));
     options.optional_services.push_back(Canonicalize("eeee"));
 
-    mojo::Array<mojo::String> expected = mojo::Array<mojo::String>();
+    mojo::Array<base::Optional<BluetoothUUID>> expected =
+        mojo::Array<base::Optional<BluetoothUUID>>();
 
     list_.RemoveExcludedUUIDs(&options);
     EXPECT_TRUE(options.optional_services.Equals(expected));
   }
 }
 
 TEST_F(BluetoothBlacklistTest, VerifyDefaultBlacklistSize) {
   // When adding items to the blacklist the new values should be added in the
   // tests below for each exclusion type.
   EXPECT_EQ(11u, list_.size());
@@ skipping 34 matching lines @@
   EXPECT_TRUE(list_.IsExcludedFromWrites(BluetoothUUID("2a02")));
   EXPECT_TRUE(list_.IsExcludedFromWrites(BluetoothUUID("2a03")));
   EXPECT_TRUE(list_.IsExcludedFromWrites(BluetoothUUID("2a25")));
   EXPECT_TRUE(list_.IsExcludedFromWrites(BluetoothUUID("2902")));
   EXPECT_TRUE(list_.IsExcludedFromWrites(BluetoothUUID("2903")));
   EXPECT_TRUE(list_.IsExcludedFromWrites(
       BluetoothUUID("bad2ddcf-60db-45cd-bef9-fd72b153cf7c")));
 }
 
 }  // namespace content