Remove server in connection version negotiation code.
gfe-relnote: Deprecate gfe2_restart_flag_quic_no_server_conn_ver_negotiation2.
PiperOrigin-RevId: 254442620
Change-Id: I490aa71424a9cfb0ee36d1d6a202080f41eeec2f
diff --git a/quic/test_tools/quic_connection_peer.cc b/quic/test_tools/quic_connection_peer.cc
index 6492a68..66d1a51 100644
--- a/quic/test_tools/quic_connection_peer.cc
+++ b/quic/test_tools/quic_connection_peer.cc
@@ -304,7 +304,7 @@
// static
void QuicConnectionPeer::SetNegotiatedVersion(QuicConnection* connection) {
- connection->version_negotiation_state_ = QuicConnection::NEGOTIATED_VERSION;
+ connection->version_negotiated_ = true;
}
// static
@@ -316,13 +316,6 @@
}
// static
-void QuicConnectionPeer::SetNoVersionNegotiation(QuicConnection* connection,
- bool no_version_negotiation) {
- *const_cast<bool*>(&connection->no_version_negotiation_) =
- no_version_negotiation;
-}
-
-// static
bool QuicConnectionPeer::SupportsReleaseTime(QuicConnection* connection) {
return connection->supports_release_time_;
}
diff --git a/quic/test_tools/quic_connection_peer.h b/quic/test_tools/quic_connection_peer.h
index 3cd8520..d0797f5 100644
--- a/quic/test_tools/quic_connection_peer.h
+++ b/quic/test_tools/quic_connection_peer.h
@@ -128,8 +128,6 @@
static void SetMaxConsecutiveNumPacketsWithNoRetransmittableFrames(
QuicConnection* connection,
size_t new_value);
- static void SetNoVersionNegotiation(QuicConnection* connection,
- bool no_version_negotiation);
static bool SupportsReleaseTime(QuicConnection* connection);
static QuicConnection::PacketContent GetCurrentPacketContent(
QuicConnection* connection);
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index 4ff4554..6ffcb8c 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc
@@ -192,7 +192,7 @@
MockFramerVisitor::MockFramerVisitor() {
// By default, we want to accept packets.
- ON_CALL(*this, OnProtocolVersionMismatch(_, _))
+ ON_CALL(*this, OnProtocolVersionMismatch(_))
.WillByDefault(testing::Return(false));
// By default, we want to accept packets.
@@ -232,8 +232,8 @@
MockFramerVisitor::~MockFramerVisitor() {}
-bool NoOpFramerVisitor::OnProtocolVersionMismatch(ParsedQuicVersion /*version*/,
- PacketHeaderFormat /*form*/) {
+bool NoOpFramerVisitor::OnProtocolVersionMismatch(
+ ParsedQuicVersion /*version*/) {
return false;
}
@@ -479,8 +479,7 @@
}
bool MockQuicConnection::OnProtocolVersionMismatch(
- ParsedQuicVersion /*version*/,
- PacketHeaderFormat /*form*/) {
+ ParsedQuicVersion /*version*/) {
return false;
}
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h
index 221dd6f..db103de 100644
--- a/quic/test_tools/quic_test_utils.h
+++ b/quic/test_tools/quic_test_utils.h
@@ -241,8 +241,7 @@
MOCK_METHOD1(OnError, void(QuicFramer* framer));
// The constructor sets this up to return false by default.
- MOCK_METHOD2(OnProtocolVersionMismatch,
- bool(ParsedQuicVersion version, PacketHeaderFormat form));
+ MOCK_METHOD1(OnProtocolVersionMismatch, bool(ParsedQuicVersion version));
MOCK_METHOD0(OnPacket, void());
MOCK_METHOD1(OnPublicResetPacket, void(const QuicPublicResetPacket& header));
MOCK_METHOD1(OnVersionNegotiationPacket,
@@ -306,8 +305,7 @@
void OnRetryPacket(QuicConnectionId /*original_connection_id*/,
QuicConnectionId /*new_connection_id*/,
QuicStringPiece /*retry_token*/) override {}
- bool OnProtocolVersionMismatch(ParsedQuicVersion version,
- PacketHeaderFormat form) override;
+ bool OnProtocolVersionMismatch(ParsedQuicVersion version) override;
bool OnUnauthenticatedHeader(const QuicPacketHeader& header) override;
bool OnUnauthenticatedPublicHeader(const QuicPacketHeader& header) override;
void OnDecryptedPacket(EncryptionLevel /*level*/) override {}
@@ -530,8 +528,7 @@
QuicConnection::ProcessUdpPacket(self_address, peer_address, packet);
}
- bool OnProtocolVersionMismatch(ParsedQuicVersion version,
- PacketHeaderFormat form) override;
+ bool OnProtocolVersionMismatch(ParsedQuicVersion version) override;
bool ReallySendControlFrame(const QuicFrame& frame) {
return QuicConnection::SendControlFrame(frame);
diff --git a/quic/test_tools/simple_quic_framer.cc b/quic/test_tools/simple_quic_framer.cc
index 07988cc..547f6d2 100644
--- a/quic/test_tools/simple_quic_framer.cc
+++ b/quic/test_tools/simple_quic_framer.cc
@@ -24,8 +24,7 @@
void OnError(QuicFramer* framer) override { error_ = framer->error(); }
- bool OnProtocolVersionMismatch(ParsedQuicVersion /*version*/,
- PacketHeaderFormat /*form*/) override {
+ bool OnProtocolVersionMismatch(ParsedQuicVersion /*version*/) override {
return false;
}
