Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: device/bluetooth/bluetooth_device_unittest.cc

Issue 2230083003: device: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_device_unittest.cc
diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc
index cb2d8ac9faa6ffa3db467fde98b04908eac2c7ba..cb48aa7555c43b987a65af86fe9d36e51800bc19 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -96,8 +96,10 @@ TEST_F(BluetoothTest, LowEnergyDeviceProperties) {
EXPECT_EQ(base::UTF8ToUTF16(kTestDeviceName), device->GetNameForDisplay());
EXPECT_FALSE(device->IsPaired());
BluetoothDevice::UUIDList uuids = device->GetUUIDs();
- EXPECT_TRUE(ContainsValue(uuids, BluetoothUUID(kTestUUIDGenericAccess)));
- EXPECT_TRUE(ContainsValue(uuids, BluetoothUUID(kTestUUIDGenericAttribute)));
+ EXPECT_TRUE(
+ base::ContainsValue(uuids, BluetoothUUID(kTestUUIDGenericAccess)));
+ EXPECT_TRUE(
+ base::ContainsValue(uuids, BluetoothUUID(kTestUUIDGenericAttribute)));
}
#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
@@ -130,10 +132,10 @@ TEST_F(BluetoothTest, GetUUIDs) {
// Check advertised UUIDs:
EXPECT_EQ(2u, device->GetUUIDs().size());
- EXPECT_TRUE(
- ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUIDGenericAccess)));
- EXPECT_TRUE(ContainsValue(device->GetUUIDs(),
- BluetoothUUID(kTestUUIDGenericAttribute)));
+ EXPECT_TRUE(base::ContainsValue(device->GetUUIDs(),
+ BluetoothUUID(kTestUUIDGenericAccess)));
+ EXPECT_TRUE(base::ContainsValue(device->GetUUIDs(),
+ BluetoothUUID(kTestUUIDGenericAttribute)));
// Connect.
device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
@@ -152,8 +154,8 @@ TEST_F(BluetoothTest, GetUUIDs) {
// GetUUIDs should return UUIDs of services in device.
EXPECT_EQ(1u, device->GetUUIDs().size());
- EXPECT_TRUE(
- ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUIDGenericAccess)));
+ EXPECT_TRUE(base::ContainsValue(device->GetUUIDs(),
+ BluetoothUUID(kTestUUIDGenericAccess)));
#if defined(OS_MACOSX)
// Android and Windows don't yet support service changed events.
@@ -169,8 +171,8 @@ TEST_F(BluetoothTest, GetUUIDs) {
// GetUUIDs should return UUIDs of services in device.
EXPECT_EQ(1u, device->GetUUIDs().size());
- EXPECT_TRUE(
- ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUIDGenericAccess)));
+ EXPECT_TRUE(base::ContainsValue(device->GetUUIDs(),
+ BluetoothUUID(kTestUUIDGenericAccess)));
#endif // defined(OS_MACOSX)
// Disconnect.
@@ -185,10 +187,10 @@ TEST_F(BluetoothTest, GetUUIDs) {
// Check advertised UUIDs.
EXPECT_EQ(2u, device->GetUUIDs().size());
- EXPECT_TRUE(ContainsValue(device->GetUUIDs(),
- BluetoothUUID(kTestUUIDImmediateAlert)));
- EXPECT_TRUE(
- ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUIDLinkLoss)));
+ EXPECT_TRUE(base::ContainsValue(device->GetUUIDs(),
+ BluetoothUUID(kTestUUIDImmediateAlert)));
+ EXPECT_TRUE(base::ContainsValue(device->GetUUIDs(),
+ BluetoothUUID(kTestUUIDLinkLoss)));
}
#endif // defined(OS_ANDROID) || defined(OS_MACOSX)
« no previous file with comments | « device/bluetooth/bluetooth_adapter_unittest.cc ('k') | device/bluetooth/dbus/fake_bluetooth_input_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698