Index: content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc |
diff --git a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc |
index 21ddd44083dede3ef1c1b4087e534d7d3e474c0b..110025607398b790ddd00be5cf2b23ab5a686261 100644 |
--- a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc |
+++ b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc |
@@ -122,23 +122,23 @@ class FrameConnectedBluetoothDevicesTest |
}; |
TEST_F(FrameConnectedBluetoothDevicesTest, Insert_Once) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, Insert_Twice) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, Insert_TwoDevices) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -146,8 +146,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, Insert_TwoDevices) { |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, Insert_TwoMaps) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -156,7 +156,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest, Insert_TwoMaps) { |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionId_OneDevice_AddOnce_RemoveOnce) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -169,7 +169,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionId_OneDevice_AddOnce_RemoveTwice) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -183,8 +183,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionId_OneDevice_AddTwice_RemoveOnce) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -197,8 +197,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionId_OneDevice_AddTwice_RemoveTwice) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -211,8 +211,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionId_TwoDevices) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -230,8 +230,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionId_TwoDevices) { |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionId_TwoMaps) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -250,7 +250,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionId_TwoMaps) { |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionAddress_OneDevice_AddOnce_RemoveOnce) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -264,7 +264,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionAddress_OneDevice_AddOnce_RemoveTwice) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -279,8 +279,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionAddress_OneDevice_AddTwice_RemoveOnce) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -294,8 +294,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
TEST_F(FrameConnectedBluetoothDevicesTest, |
CloseConnectionAddress_OneDevice_AddTwice_RemoveTwice) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -309,8 +309,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoDevices) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -331,8 +331,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoDevices) { |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoMaps) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0)); |
@@ -353,8 +353,8 @@ TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoMaps) { |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, Destruction_MultipleDevices) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
@@ -364,11 +364,11 @@ TEST_F(FrameConnectedBluetoothDevicesTest, Destruction_MultipleDevices) { |
} |
TEST_F(FrameConnectedBluetoothDevicesTest, Destruction_MultipleMaps) { |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
- map1_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
- map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1)); |
+ map1_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
+ map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr); |
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice()); |
@@ -387,7 +387,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest, |
// Tests that we don't crash when FrameConnectedBluetoothDevices contains |
// at least one device, and it is destroyed while WebContentsImpl is being |
// destroyed. |
- map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0)); |
+ map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr); |
DeleteContents(); |
} |