commit 5a2b3eb82c2179b7cffa90a31a52abd8223ef53b
author rch <rch@google.com> Fri Aug 23 11:49:33 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Aug 23 12:20:13 2019 -0700
tree 6f2cfd0bd80deb9e5de30b9b34016818efe7ee9a
parent 260d64635610e5e0d3ddefce7f7dd370e9714dc3

Change QUIC's AlpnForVersion method to omit the "google-" from the string
to reduce the size of Alt-Svc advertisements which use this format.

gfe-relnote: n/a - QUIC v99 only
PiperOrigin-RevId: 265102784
Change-Id: Ie242e350b3609c8d94002280abef54a80e17172f

quic/core/quic_versions.cc

diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index af93f85..eb16862 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -453,7 +453,7 @@
     return "h3-" + QuicTextUtils::Uint64ToString(
                        GetQuicFlag(FLAGS_quic_ietf_draft_version));
   }
-  return "h3-google-" + ParsedQuicVersionToString(parsed_version);
+  return "h3-" + ParsedQuicVersionToString(parsed_version);
 }
 
 void QuicVersionInitializeSupportForIetfDraft(int32_t draft_version) {

quic/core/quic_versions_test.cc

diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc
index 99f4eb4..d4e8065 100644
--- a/quic/core/quic_versions_test.cc
+++ b/quic/core/quic_versions_test.cc
@@ -464,11 +464,11 @@
   ParsedQuicVersion parsed_version_t099 =
       ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_99);
 
-  EXPECT_EQ("h3-google-Q047", AlpnForVersion(parsed_version_q047));
-  EXPECT_EQ("h3-google-T047", AlpnForVersion(parsed_version_t047));
-  EXPECT_EQ("h3-google-Q048", AlpnForVersion(parsed_version_q048));
-  EXPECT_EQ("h3-google-T048", AlpnForVersion(parsed_version_t048));
-  EXPECT_EQ("h3-google-T099", AlpnForVersion(parsed_version_t099));
+  EXPECT_EQ("h3-Q047", AlpnForVersion(parsed_version_q047));
+  EXPECT_EQ("h3-T047", AlpnForVersion(parsed_version_t047));
+  EXPECT_EQ("h3-Q048", AlpnForVersion(parsed_version_q048));
+  EXPECT_EQ("h3-T048", AlpnForVersion(parsed_version_t048));
+  EXPECT_EQ("h3-T099", AlpnForVersion(parsed_version_t099));
 }
 
 TEST_F(QuicVersionsTest, InitializeSupportForIetfDraft) {
@@ -476,12 +476,12 @@
       ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_99);
   EXPECT_EQ(MakeVersionLabel('T', '0', '9', '9'),
             CreateQuicVersionLabel(parsed_version_t099));
-  EXPECT_EQ("h3-google-T099", AlpnForVersion(parsed_version_t099));
+  EXPECT_EQ("h3-T099", AlpnForVersion(parsed_version_t099));
 
   QuicVersionInitializeSupportForIetfDraft(0);
   EXPECT_EQ(MakeVersionLabel('T', '0', '9', '9'),
             CreateQuicVersionLabel(parsed_version_t099));
-  EXPECT_EQ("h3-google-T099", AlpnForVersion(parsed_version_t099));
+  EXPECT_EQ("h3-T099", AlpnForVersion(parsed_version_t099));
   EXPECT_FALSE(GetQuicFlag(FLAGS_quic_supports_tls_handshake));
 
   QuicVersionInitializeSupportForIetfDraft(18);
@@ -493,7 +493,7 @@
   QuicVersionInitializeSupportForIetfDraft(0);
   EXPECT_EQ(MakeVersionLabel('T', '0', '9', '9'),
             CreateQuicVersionLabel(parsed_version_t099));
-  EXPECT_EQ("h3-google-T099", AlpnForVersion(parsed_version_t099));
+  EXPECT_EQ("h3-T099", AlpnForVersion(parsed_version_t099));
 }
 
 TEST_F(QuicVersionsTest, QuicEnableVersion) {