Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(632)

Unified Diff: net/quic/core/quic_protocol.cc

Issue 2401363004: relnote: Deprecate flag quic_disable_pre_32 (Closed)
Patch Set: remove unused LoadTestCert method Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/quic_protocol.h ('k') | net/quic/core/quic_protocol_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_protocol.cc
diff --git a/net/quic/core/quic_protocol.cc b/net/quic/core/quic_protocol.cc
index 4053dc09926905c02577153280afefefdcba2f76..7c99b8e26f971f6a6fa0169f1075e8187ff50e5f 100644
--- a/net/quic/core/quic_protocol.cc
+++ b/net/quic/core/quic_protocol.cc
@@ -187,11 +187,7 @@ QuicVersionVector FilterSupportedVersions(QuicVersionVector versions) {
QuicVersionVector filtered_versions(versions.size());
filtered_versions.clear(); // Guaranteed by spec not to change capacity.
for (QuicVersion version : versions) {
- if (version < QUIC_VERSION_32) {
- if (!FLAGS_quic_disable_pre_32 && !FLAGS_quic_disable_pre_34) {
- filtered_versions.push_back(version);
- }
- } else if (version < QUIC_VERSION_34) {
+ if (version < QUIC_VERSION_34) {
if (!FLAGS_quic_disable_pre_34) {
filtered_versions.push_back(version);
}
@@ -223,10 +219,6 @@ QuicVersionVector VersionOfIndex(const QuicVersionVector& versions, int index) {
QuicTag QuicVersionToQuicTag(const QuicVersion version) {
switch (version) {
- case QUIC_VERSION_30:
- return MakeQuicTag('Q', '0', '3', '0');
- case QUIC_VERSION_31:
- return MakeQuicTag('Q', '0', '3', '1');
case QUIC_VERSION_32:
return MakeQuicTag('Q', '0', '3', '2');
case QUIC_VERSION_33:
@@ -263,8 +255,6 @@ QuicVersion QuicTagToQuicVersion(const QuicTag version_tag) {
string QuicVersionToString(const QuicVersion version) {
switch (version) {
- RETURN_STRING_LITERAL(QUIC_VERSION_30);
- RETURN_STRING_LITERAL(QUIC_VERSION_31);
RETURN_STRING_LITERAL(QUIC_VERSION_32);
RETURN_STRING_LITERAL(QUIC_VERSION_33);
RETURN_STRING_LITERAL(QUIC_VERSION_34);
@@ -784,8 +774,7 @@ StringPiece QuicPacket::Plaintext(QuicVersion version) const {
}
QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions)
- : disable_pre_32_(FLAGS_quic_disable_pre_32),
- disable_pre_34_(FLAGS_quic_disable_pre_34),
+ : disable_pre_34_(FLAGS_quic_disable_pre_34),
enable_version_35_(FLAGS_quic_enable_version_35),
enable_version_36_(FLAGS_quic_enable_version_36_v2),
allowed_supported_versions_(supported_versions),
@@ -795,11 +784,9 @@ QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions)
QuicVersionManager::~QuicVersionManager() {}
const QuicVersionVector& QuicVersionManager::GetSupportedVersions() {
- if (disable_pre_32_ != FLAGS_quic_disable_pre_32 ||
- disable_pre_34_ != FLAGS_quic_disable_pre_34 ||
+ if (disable_pre_34_ != FLAGS_quic_disable_pre_34 ||
enable_version_35_ != FLAGS_quic_enable_version_35 ||
enable_version_36_ != FLAGS_quic_enable_version_36_v2) {
- disable_pre_32_ = FLAGS_quic_disable_pre_32;
disable_pre_34_ = FLAGS_quic_disable_pre_34;
enable_version_35_ = FLAGS_quic_enable_version_35;
enable_version_36_ = FLAGS_quic_enable_version_36_v2;
« no previous file with comments | « net/quic/core/quic_protocol.h ('k') | net/quic/core/quic_protocol_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698