Use new wrapper types for web_bluetooth.mojom

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/web_bluetooth_device_id.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ skipping 192 matching lines @@
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id, kGlucoseUUID));
 }
 
 TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginOneDevice) {
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   // Setup device.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
-  blink::mojom::WebBluetoothScanFilterPtr scanFilter1 =
+  blink::mojom::WebBluetoothScanFilterPtr scan_filter1 =
       blink::mojom::WebBluetoothScanFilter::New();
-  blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
+  scan_filter1->services = std::vector<BluetoothUUID>();

[ortuno, 2016/11/21 04:42:31]

nit: move this to where services is modified.

[juncai, 2016/11/21 21:27:05]

Done.

+  blink::mojom::WebBluetoothScanFilterPtr scan_filter2 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter2->services = std::vector<BluetoothUUID>();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
-  options->filters.push_back(scanFilter1.Clone());
+  scan_filter1->services->push_back(kGlucoseUUID);
+  options->filters.push_back(scan_filter1.Clone());
 
-  scanFilter2->services.push_back(kHeartRateUUID);
-  options->filters.push_back(scanFilter2.Clone());
+  scan_filter2->services->push_back(kHeartRateUUID);
+  options->filters.push_back(scan_filter2.Clone());
 
   options->optional_services.push_back(kBatteryServiceUUID);
   options->optional_services.push_back(kHeartRateUUID);
 
   // Add to map.
   const WebBluetoothDeviceId device_id1 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options);
 
   // Access allowed services.
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
@@ skipping 18 matching lines @@
       kTestOrigin1, device_id1, kGlucoseUUID));
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kHeartRateUUID));
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kBatteryServiceUUID));
 
   // Add device back.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
 
-  options2->filters.push_back(scanFilter1.Clone());
-  options2->filters.push_back(scanFilter2.Clone());
+  options2->filters.push_back(scan_filter1.Clone());
+  options2->filters.push_back(scan_filter2.Clone());
 
   const WebBluetoothDeviceId device_id2 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options2);
 
   // Access allowed services.
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
       kTestOrigin1, device_id2));
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id2, kGlucoseUUID));
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
@@ skipping 11 matching lines @@
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id1, kBatteryServiceUUID));
 }
 
 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::WebBluetoothScanFilterPtr scan_filter1 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter1->services = std::vector<BluetoothUUID>();

[ortuno, 2016/11/21 04:42:31]

nit: Group this with the line that modifies services. Same for other instances
in the file.

[juncai, 2016/11/21 21:27:05]

Done.

 
-  scanFilter1->services.push_back(kGlucoseUUID);
-  options1->filters.push_back(std::move(scanFilter1));
+  scan_filter1->services->push_back(kGlucoseUUID);
+  options1->filters.push_back(std::move(scan_filter1));
 
   options1->optional_services.push_back(kHeartRateUUID);
 
   // Setup request for device #2.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
-  blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
+  blink::mojom::WebBluetoothScanFilterPtr scan_filter2 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter2->services = std::vector<BluetoothUUID>();
 
-  scanFilter2->services.push_back(kBatteryServiceUUID);
-  options2->filters.push_back(std::move(scanFilter2));
+  scan_filter2->services->push_back(kBatteryServiceUUID);
+  options2->filters.push_back(std::move(scan_filter2));
 
   options2->optional_services.push_back(kBloodPressureUUID);
 
   // Add devices to map.
   const WebBluetoothDeviceId& device_id1 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
   const WebBluetoothDeviceId& device_id2 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress2, options2);
 
   // Access allowed services.
@@ skipping 25 matching lines @@
       kTestOrigin1, device_id2, kHeartRateUUID));
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin1, device_id2, kCyclingPowerUUID));
 }
 
 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::WebBluetoothScanFilterPtr scan_filter1 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter1->services = std::vector<BluetoothUUID>();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
-  options1->filters.push_back(std::move(scanFilter1));
+  scan_filter1->services->push_back(kGlucoseUUID);
+  options1->filters.push_back(std::move(scan_filter1));
 
   options1->optional_services.push_back(kHeartRateUUID);
 
   // Setup request #2 for device.
   blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
       blink::mojom::WebBluetoothRequestDeviceOptions::New();
-  blink::mojom::WebBluetoothScanFilterPtr scanFilter2 =
+  blink::mojom::WebBluetoothScanFilterPtr scan_filter2 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter2->services = std::vector<BluetoothUUID>();
 
-  scanFilter2->services.push_back(kBatteryServiceUUID);
-  options2->filters.push_back(std::move(scanFilter2));
+  scan_filter2->services->push_back(kBatteryServiceUUID);
+  options2->filters.push_back(std::move(scan_filter2));
 
   options2->optional_services.push_back(kBloodPressureUUID);
 
   // Add devices to map.
   const WebBluetoothDeviceId& device_id1 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
   const WebBluetoothDeviceId& device_id2 =
       allowed_devices_map.AddDevice(kTestOrigin2, kDeviceAddress1, options2);
 
   // Access allowed services.
@@ skipping 44 matching lines @@
   EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
       kTestOrigin2, device_id1, kBloodPressureUUID));
 }
 
 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::WebBluetoothScanFilterPtr scan_filter1 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter1->services = std::vector<BluetoothUUID>();
 
-  scanFilter1->services.push_back(kGlucoseUUID);
-  options1->filters.push_back(std::move(scanFilter1));
+  scan_filter1->services->push_back(kGlucoseUUID);
+  options1->filters.push_back(std::move(scan_filter1));
 
   options1->optional_services.push_back(kBatteryServiceUUID);
 
   // Add to map.
   const WebBluetoothDeviceId 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::WebBluetoothScanFilterPtr scan_filter2 =
       blink::mojom::WebBluetoothScanFilter::New();
+  scan_filter2->services = std::vector<BluetoothUUID>();
 
-  scanFilter2->services.push_back(kHeartRateUUID);
-  options2->filters.push_back(std::move(scanFilter2));
+  scan_filter2->services->push_back(kHeartRateUUID);
+  options2->filters.push_back(std::move(scan_filter2));
 
   options2->optional_services.push_back(kBloodPressureUUID);
 
   // Add to map again.
   const WebBluetoothDeviceId device_id2 =
       allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options2);
 
   EXPECT_EQ(device_id1, device_id2);
 
   EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
@@ skipping 11 matching lines @@
 TEST_F(BluetoothAllowedDevicesMapTest, CorrectIdFormat) {
   BluetoothAllowedDevicesMap allowed_devices_map;
 
   const WebBluetoothDeviceId& device_id = allowed_devices_map.AddDevice(
       kTestOrigin1, kDeviceAddress1, empty_options_);
 
   EXPECT_TRUE(WebBluetoothDeviceId::IsValid(device_id.str()));
 }
 
 }  // namespace content