commit ef61b1fc97d55d8c12dc386da6420852bae053db
author vasilvv <vasilvv@google.com> Tue Aug 30 09:48:14 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Aug 30 09:49:52 2022 -0700
tree d602a7b5219aa802e9a2a0fae5a6923db6778477
parent c2576eff37476b17ae780a366ad4e401ce3827f1

Fix and re-enable tests disabled in cl/468791547

I have applied this patch to Chromium and verified that it built.

PiperOrigin-RevId: 471017729

quiche/quic/core/quic_dispatcher_test.cc

diff --git a/quiche/quic/core/quic_dispatcher_test.cc b/quiche/quic/core/quic_dispatcher_test.cc
index be74dca..794bb39 100644
--- a/quiche/quic/core/quic_dispatcher_test.cc
+++ b/quiche/quic/core/quic_dispatcher_test.cc
@@ -1064,7 +1064,6 @@
 }
 
 // TODO(b/243181134): re-enable those tests once they compile in Chromium.
-#if 0
 TEST_P(QuicDispatcherTestAllVersions, UsesConnectionIdGenerator) {
   SetQuicRestartFlag(quic_abstract_connection_id_generator, true);
   // Avoid multiple calls to MaybeReplaceConnectionId()
@@ -1083,10 +1082,10 @@
   EXPECT_CALL(*dispatcher_,
               CreateQuicSession(TestConnectionId(1), _, client_address,
                                 Eq(ExpectedAlpn()), _, _))
-      .WillOnce(Return(CreateSession(
+      .WillOnce(Return(ByMove(CreateSession(
           dispatcher_.get(), config_, TestConnectionId(1), client_address,
           &mock_helper_, &mock_alarm_factory_, &crypto_config_,
-          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_)));
+          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_))));
   ProcessFirstFlight(client_address, TestConnectionId(1));
   // Generator changes connection ID.
   QuicConnectionId new_connection_id(
@@ -1096,10 +1095,10 @@
   EXPECT_CALL(*dispatcher_,
               CreateQuicSession(new_connection_id, _, client_address,
                                 Eq(ExpectedAlpn()), _, _))
-      .WillOnce(Return(CreateSession(
+      .WillOnce(Return(ByMove(CreateSession(
           dispatcher_.get(), config_, new_connection_id, client_address,
           &mock_helper_, &mock_alarm_factory_, &crypto_config_,
-          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_)));
+          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_))));
   ProcessFirstFlight(client_address, TestConnectionId(2));
 }
 
@@ -1120,23 +1119,22 @@
   EXPECT_CALL(*dispatcher_,
               CreateQuicSession(TestConnectionId(1), _, client_address,
                                 Eq(ExpectedAlpn()), _, _))
-      .WillOnce(Return(CreateSession(
+      .WillOnce(Return(ByMove(CreateSession(
           dispatcher_.get(), config_, TestConnectionId(1), client_address,
           &mock_helper_, &mock_alarm_factory_, &crypto_config_,
-          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_)));
+          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_))));
   ProcessFirstFlight(client_address, TestConnectionId(1));
   EXPECT_CALL(generator, MaybeReplaceConnectionId(TestConnectionId(2), _))
       .Times(0);
   EXPECT_CALL(*dispatcher_,
               CreateQuicSession(TestConnectionId(2), _, client_address,
                                 Eq(ExpectedAlpn()), _, _))
-      .WillOnce(Return(CreateSession(
+      .WillOnce(Return(ByMove(CreateSession(
           dispatcher_.get(), config_, TestConnectionId(2), client_address,
           &mock_helper_, &mock_alarm_factory_, &crypto_config_,
-          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_)));
+          QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_))));
   ProcessFirstFlight(client_address, TestConnectionId(2));
 }
-#endif
 
 // Makes sure nine-byte connection IDs are replaced by 8-byte ones.
 TEST_P(QuicDispatcherTestAllVersions, LongConnectionIdLengthReplaced) {