Land Recent QUIC Changes.

net/quic/quic_dispatcher.h

 // Copyright 2014 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.
 //
 // A server side dispatcher which dispatches a given client's data to their
 // stream.
 
 #ifndef NET_QUIC_QUIC_DISPATCHER_H_
 #define NET_QUIC_QUIC_DISPATCHER_H_
 
@@ skipping 119 matching lines @@
   }
 
   QuicTimeWaitListManager* time_wait_list_manager() {
     return time_wait_list_manager_.get();
   }
 
   const QuicVersionVector& supported_versions() const {
     return supported_versions_;
   }
 
-  const QuicVersionVector& supported_versions_no_connection_flow_control()
-      const {
-    return supported_versions_no_connection_flow_control_;
-  }
-
   const IPEndPoint& current_server_address() {
     return current_server_address_;
   }
   const IPEndPoint& current_client_address() {
     return current_client_address_;
   }
   const QuicEncryptedPacket& current_packet() {
     return *current_packet_;
   }
 
@@ skipping 44 matching lines @@
 
   // The writer to write to the socket with.
   scoped_ptr<QuicServerPacketWriter> writer_;
 
   // This vector contains QUIC versions which we currently support.
   // This should be ordered such that the highest supported version is the first
   // element, with subsequent elements in descending order (versions can be
   // skipped as necessary).
   const QuicVersionVector supported_versions_;
 
-  // Versions which do not support *connection* flow control (introduced in
-  // QUIC_VERSION_19).
-  // This is used to construct new QuicConnections when connection flow control
-  // is disabled via flag.
-  // TODO(rjshade): Remove this when
-  // FLAGS_enable_quic_connection_flow_control_2 is removed.
-  QuicVersionVector supported_versions_no_connection_flow_control_;
-
   // Information about the packet currently being handled.
   IPEndPoint current_client_address_;
   IPEndPoint current_server_address_;
   const QuicEncryptedPacket* current_packet_;
 
   QuicFramer framer_;
   scoped_ptr<QuicFramerVisitor> framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_DISPATCHER_H_