Index: net/quic/quic_config.cc |
diff --git a/net/quic/quic_config.cc b/net/quic/quic_config.cc |
index 9d0a7c9bb3553c374fbc0e8a7620c534db2c0e2c..803ae7f517146a0ed03cb41867fdd99a9cd498ec 100644 |
--- a/net/quic/quic_config.cc |
+++ b/net/quic/quic_config.cc |
@@ -9,7 +9,6 @@ |
#include "base/logging.h" |
#include "net/quic/crypto/crypto_handshake_message.h" |
#include "net/quic/crypto/crypto_protocol.h" |
-#include "net/quic/quic_flags.h" |
#include "net/quic/quic_utils.h" |
using std::min; |
@@ -594,9 +593,8 @@ bool QuicConfig::negotiated() const { |
// TODO(ianswett): Add the negotiated parameters once and iterate over all |
// of them in negotiated, ToHandshakeMessage, ProcessClientHello, and |
// ProcessServerHello. |
- return congestion_feedback_.negotiated() && |
- idle_connection_state_lifetime_seconds_.negotiated() && |
- max_streams_per_connection_.negotiated(); |
+ return idle_connection_state_lifetime_seconds_.negotiated() && |
+ max_streams_per_connection_.negotiated(); |
} |
void QuicConfig::SetDefaults() { |
@@ -609,11 +607,7 @@ void QuicConfig::SetDefaults() { |
congestion_feedback_.set(congestion_feedback, kQBIC); |
idle_connection_state_lifetime_seconds_.set(kMaximumIdleTimeoutSecs, |
kDefaultIdleTimeoutSecs); |
- if (FLAGS_quic_allow_silent_close) { |
- silent_close_.set(1, 0); |
- } else { |
- silent_close_.set(0, 0); |
- } |
+ silent_close_.set(1, 0); |
SetMaxStreamsPerConnection(kDefaultMaxStreamsPerConnection, |
kDefaultMaxStreamsPerConnection); |
max_time_before_crypto_handshake_ = |
@@ -647,10 +641,6 @@ QuicErrorCode QuicConfig::ProcessPeerHello( |
QuicErrorCode error = QUIC_NO_ERROR; |
if (error == QUIC_NO_ERROR) { |
- error = congestion_feedback_.ProcessPeerHello( |
- peer_hello, hello_type, error_details); |
- } |
- if (error == QUIC_NO_ERROR) { |
error = idle_connection_state_lifetime_seconds_.ProcessPeerHello( |
peer_hello, hello_type, error_details); |
} |