commit 256b2d65bbfc82b503ac1ecbabe32b75f6f98bd4
author wub <wub@google.com> Mon Nov 25 08:46:55 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 25 08:47:34 2019 -0800
tree 27f9874e6d1b2a0266887f9fcae5bd5bc88f6f79
parent 2fd0c6c69e850fcde513d402e63495e8f4aa3b59

gfe-relnote: For server side QUIC connection, mark version_negotiated_ earlier. Protected by --gfe2_reloadable_flag_quic_version_negotiated_by_default_at_server.

PiperOrigin-RevId: 282365816
Change-Id: I9083e05d758f564befaab126e427f7ab434d2f6f

quic/test_tools/crypto_test_utils.cc

diff --git a/quic/test_tools/crypto_test_utils.cc b/quic/test_tools/crypto_test_utils.cc
index 83efd21..6716dec 100644
--- a/quic/test_tools/crypto_test_utils.cc
+++ b/quic/test_tools/crypto_test_utils.cc
@@ -235,8 +235,10 @@
       server_conn, *server_quic_config, client_conn->supported_versions(),
       crypto_config, &compressed_certs_cache);
   server_session.Initialize();
-  server_session.OnSuccessfulVersionNegotiation(
-      client_conn->supported_versions().front());
+  if (!GetQuicReloadableFlag(quic_version_negotiated_by_default_at_server)) {
+    server_session.OnSuccessfulVersionNegotiation(
+        client_conn->supported_versions().front());
+  }
   EXPECT_CALL(*server_session.helper(),
               CanAcceptClientHello(testing::_, testing::_, testing::_,
                                    testing::_, testing::_))