Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.cc

Index: net/tools/quic/quic_dispatcher.cc
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index b873f98618abe602162e97fa738cae86b7ee74be..52778febec2f809abfc693937e1486aadaf5e3eb 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -169,7 +169,6 @@ QuicDispatcher::QuicDispatcher(const QuicConfig& config,
       epoll_server_(epoll_server),
       helper_(new QuicEpollConnectionHelper(epoll_server_)),
       supported_versions_(supported_versions),
-      supported_versions_no_flow_control_(supported_versions),
       supported_versions_no_connection_flow_control_(supported_versions),
       current_packet_(NULL),
       framer_(supported_versions, /*unused*/ QuicTime::Zero(), true),
@@ -187,17 +186,6 @@ void QuicDispatcher::Initialize(int fd) {
   writer_.reset(CreateWriter(fd));
   time_wait_list_manager_.reset(CreateQuicTimeWaitListManager());
 
-  // Remove all versions > QUIC_VERSION_16 from the
-  // supported_versions_no_flow_control_ vector.
-  QuicVersionVector::iterator it =
-      find(supported_versions_no_flow_control_.begin(),
-           supported_versions_no_flow_control_.end(), QUIC_VERSION_17);
-  if (it != supported_versions_no_flow_control_.end()) {
-    supported_versions_no_flow_control_.erase(
-        supported_versions_no_flow_control_.begin(), it + 1);
-  }
-  CHECK(!supported_versions_no_flow_control_.empty());
-
   // Remove all versions > QUIC_VERSION_18 from the
   // supported_versions_no_connection_flow_control_ vector.
   QuicVersionVector::iterator connection_it = find(
@@ -389,27 +377,17 @@ QuicConnection* QuicDispatcher::CreateQuicConnection(
     QuicConnectionId connection_id,
     const IPEndPoint& server_address,
     const IPEndPoint& client_address) {
-  if (FLAGS_enable_quic_stream_flow_control_2 &&
-      FLAGS_enable_quic_connection_flow_control_2) {
+  if (FLAGS_enable_quic_connection_flow_control_2) {
     DLOG(INFO) << "Creating QuicDispatcher with all versions.";
     return new QuicConnection(connection_id, client_address, helper_.get(),
                               writer_.get(), true, supported_versions_);
   }
 
-  if (FLAGS_enable_quic_stream_flow_control_2 &&
-      !FLAGS_enable_quic_connection_flow_control_2) {
-    DLOG(INFO) << "Connection flow control disabled, creating QuicDispatcher "
-               << "WITHOUT version 19 or higher.";
-    return new QuicConnection(connection_id, client_address, helper_.get(),
-                              writer_.get(), true,
-                              supported_versions_no_connection_flow_control_);
-  }
-
-  DLOG(INFO) << "Flow control disabled, creating QuicDispatcher WITHOUT "
-             << "version 17 or higher.";
+  DLOG(INFO) << "Connection flow control disabled, creating QuicDispatcher "
+             << "WITHOUT version 19 or higher.";
   return new QuicConnection(connection_id, client_address, helper_.get(),
                             writer_.get(), true,
-                            supported_versions_no_flow_control_);
+                            supported_versions_no_connection_flow_control_);
 }
 
 QuicTimeWaitListManager* QuicDispatcher::CreateQuicTimeWaitListManager() {