Revert of Landing Recent QUIC Changes.

net/quic/quic_config.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_config.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "net/quic/crypto/crypto_handshake_message.h"
@@ skipping 576 matching lines @@
 }
 
 uint32 QuicConfig::ReceivedSocketReceiveBuffer() const {
   return socket_receive_buffer_.GetReceivedValue();
 }
 
 bool QuicConfig::negotiated() const {
   // TODO(ianswett): Add the negotiated parameters once and iterate over all
   // of them in negotiated, ToHandshakeMessage, ProcessClientHello, and
   // ProcessServerHello.
-  return idle_connection_state_lifetime_seconds_.negotiated() &&
-         max_streams_per_connection_.negotiated();
+  return congestion_feedback_.negotiated() &&
+      idle_connection_state_lifetime_seconds_.negotiated() &&
+      max_streams_per_connection_.negotiated();
 }
 
 void QuicConfig::SetDefaults() {
   QuicTagVector congestion_feedback;
   // TODO(alyssar) stop sending this once QUIC_VERSION_23 is sunset.
   // This field was required until version 22 was removed but by the time
   // QUIC_VERSION_23 is sunset, no users of QUIC_VERSION_24 should be expecting
   // it.
   congestion_feedback.push_back(kQBIC);
   congestion_feedback_.set(congestion_feedback, kQBIC);
@@ skipping 30 matching lines @@
 }
 
 QuicErrorCode QuicConfig::ProcessPeerHello(
     const CryptoHandshakeMessage& peer_hello,
     HelloType hello_type,
     string* error_details) {
   DCHECK(error_details != nullptr);
 
   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);
   }
   if (error == QUIC_NO_ERROR) {
     error =
         silent_close_.ProcessPeerHello(peer_hello, hello_type, error_details);
   }
   if (error == QUIC_NO_ERROR) {
     error = max_streams_per_connection_.ProcessPeerHello(
         peer_hello, hello_type, error_details);
@@ skipping 19 matching lines @@
         peer_hello, hello_type, error_details);
   }
   if (error == QUIC_NO_ERROR) {
     error = connection_options_.ProcessPeerHello(
         peer_hello, hello_type, error_details);
   }
   return error;
 }
 
 }  // namespace net