bluetooth: When adding a device a second time merge the list of services.

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 "content/common/bluetooth/bluetooth_scan_filter.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 332 matching lines @@
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin2, device_id1, kGlucoseUUIDString));
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin2, device_id1, kHeartRateUUIDString));
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin2, device_id1, kBatteryServiceUUIDString));
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin2, device_id1, kBloodPressureUUIDString));
 }
 
+TEST(BluetoothAllowedDevicesMapTest, MergeServices) {
+  BluetoothAllowedDevicesMap allowed_devices_map;
+
+  // Setup first request.
+  BluetoothScanFilter scanFilter1;
+  scanFilter1.services.push_back(kGlucoseUUID);
+  std::vector<BluetoothScanFilter> filters1;
+  filters1.push_back(scanFilter1);
+  std::vector<BluetoothUUID> optional_services1;
+  optional_services1.push_back(kBatteryServiceUUID);
+
+  // Add to map.
+  const std::string device_id1 = allowed_devices_map.AddDevice(
+      kTestOrigin1, kDeviceAddress1, filters1, optional_services1);
+
+  // Setup second request.
+  BluetoothScanFilter scanFilter2;
+  scanFilter2.services.push_back(kHeartRateUUID);
+  std::vector<BluetoothScanFilter> filters2;
+  filters2.push_back(scanFilter2);
+  std::vector<BluetoothUUID> optional_services2;
+  optional_services2.push_back(kBloodPressureUUID);
+
+  // Add to map again.
+  const std::string device_id2 = allowed_devices_map.AddDevice(
+      kTestOrigin1, kDeviceAddress1, filters2, optional_services2);
+
+  EXPECT_EQ(device_id1, device_id2);
+
+  EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
+      kTestOrigin1, device_id1, kGlucoseUUIDString));
+  EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
+      kTestOrigin1, device_id1, kBatteryServiceUUIDString));
+  EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
+      kTestOrigin1, device_id1, kHeartRateUUIDString));
+  EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
+      kTestOrigin1, device_id1, kBloodPressureUUIDString));
+}
+
 TEST(BluetoothAllowedDevicesMapTest, CorrectIdFormat) {
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   const std::string& device_id = allowed_devices_map.AddDevice(
       kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
 
   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