Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/test_tools/simulator/quic_endpoint_test.cc

Index: net/quic/test_tools/simulator/quic_endpoint_test.cc
diff --git a/net/quic/test_tools/simulator/quic_endpoint_test.cc b/net/quic/test_tools/simulator/quic_endpoint_test.cc
index 9962b55a5f6110b8802531bb6b16ff4cf0927cc3..5a136733138db583d9faf4447e0d2f5a401218a8 100644
--- a/net/quic/test_tools/simulator/quic_endpoint_test.cc
+++ b/net/quic/test_tools/simulator/quic_endpoint_test.cc
@@ -16,6 +16,7 @@
 using ::testing::_;
 using ::testing::NiceMock;
 using ::testing::Return;
+using net::test::GetPeerInMemoryConnectionId;
 
 namespace net {
 namespace simulator {
@@ -48,7 +49,8 @@ TEST_F(QuicEndpointTest, OneWayTransmission) {
   QuicEndpoint endpoint_a(&simulator_, "Endpoint A", "Endpoint B",
                           Perspective::IS_CLIENT, 42);
   QuicEndpoint endpoint_b(&simulator_, "Endpoint B", "Endpoint A",
-                          Perspective::IS_SERVER, 42);
+                          Perspective::IS_SERVER,
+                          GetPeerInMemoryConnectionId(42));
   auto link_a = Link(&endpoint_a, switch_.port(1));
   auto link_b = Link(&endpoint_b, switch_.port(2));
 
@@ -83,7 +85,8 @@ TEST_F(QuicEndpointTest, WriteBlocked) {
   QuicEndpoint endpoint_a(&simulator_, "Endpoint A", "Endpoint B",
                           Perspective::IS_CLIENT, 42);
   QuicEndpoint endpoint_b(&simulator_, "Endpoint B", "Endpoint A",
-                          Perspective::IS_SERVER, 42);
+                          Perspective::IS_SERVER,
+                          GetPeerInMemoryConnectionId(42));
   auto link_a = Link(&endpoint_a, switch_.port(1));
   auto link_b = Link(&endpoint_b, switch_.port(2));
 
@@ -123,7 +126,8 @@ TEST_F(QuicEndpointTest, TwoWayTransmission) {
   QuicEndpoint endpoint_a(&simulator_, "Endpoint A", "Endpoint B",
                           Perspective::IS_CLIENT, 42);
   QuicEndpoint endpoint_b(&simulator_, "Endpoint B", "Endpoint A",
-                          Perspective::IS_SERVER, 42);
+                          Perspective::IS_SERVER,
+                          GetPeerInMemoryConnectionId(42));
   auto link_a = Link(&endpoint_a, switch_.port(1));
   auto link_b = Link(&endpoint_b, switch_.port(2));
 
@@ -153,11 +157,14 @@ TEST_F(QuicEndpointTest, Competition) {
   auto endpoint_c = QuicMakeUnique<QuicEndpoint>(
       &simulator_, "Endpoint C", "Endpoint D (C)", Perspective::IS_CLIENT, 44);
   auto endpoint_d_a = QuicMakeUnique<QuicEndpoint>(
-      &simulator_, "Endpoint D (A)", "Endpoint A", Perspective::IS_SERVER, 42);
+      &simulator_, "Endpoint D (A)", "Endpoint A", Perspective::IS_SERVER,
+      GetPeerInMemoryConnectionId(42));
   auto endpoint_d_b = QuicMakeUnique<QuicEndpoint>(
-      &simulator_, "Endpoint D (B)", "Endpoint B", Perspective::IS_SERVER, 43);
+      &simulator_, "Endpoint D (B)", "Endpoint B", Perspective::IS_SERVER,
+      GetPeerInMemoryConnectionId(43));
   auto endpoint_d_c = QuicMakeUnique<QuicEndpoint>(
-      &simulator_, "Endpoint D (C)", "Endpoint C", Perspective::IS_SERVER, 44);
+      &simulator_, "Endpoint D (C)", "Endpoint C", Perspective::IS_SERVER,
+      GetPeerInMemoryConnectionId(44));
   QuicEndpointMultiplexer endpoint_d(
       "Endpoint D",
       {endpoint_d_a.get(), endpoint_d_b.get(), endpoint_d_c.get()});