Land Recent QUIC Changes.

net/quic/quic_dispatcher.cc

Index: net/quic/quic_dispatcher.cc
diff --git a/net/quic/quic_dispatcher.cc b/net/quic/quic_dispatcher.cc
index 5c6836aa3db4f2eafe81dab41f5dfadad2ce51eb..802f00b8dfa0635f1613c204ce9460b3c8797f96 100644
--- a/net/quic/quic_dispatcher.cc
+++ b/net/quic/quic_dispatcher.cc
@@ -164,7 +164,6 @@ QuicDispatcher::QuicDispatcher(const QuicConfig& config,
       delete_sessions_alarm_(
           helper_->CreateAlarm(new DeleteSessionsAlarm(this))),
       supported_versions_(supported_versions),
-      supported_versions_no_connection_flow_control_(supported_versions),
       current_packet_(NULL),
       framer_(supported_versions, /*unused*/ QuicTime::Zero(), true),
       framer_visitor_(new QuicFramerVisitor(this)) {
@@ -180,19 +179,6 @@ void QuicDispatcher::Initialize(QuicServerPacketWriter* writer) {
   DCHECK(writer_ == NULL);
   writer_.reset(writer);
   time_wait_list_manager_.reset(CreateQuicTimeWaitListManager());
-
-  // Remove all versions > QUIC_VERSION_18 from the
-  // supported_versions_no_connection_flow_control_ vector.
-  QuicVersionVector::iterator connection_it =
-      find(supported_versions_no_connection_flow_control_.begin(),
-           supported_versions_no_connection_flow_control_.end(),
-           QUIC_VERSION_19);
-  if (connection_it != supported_versions_no_connection_flow_control_.end()) {
-    supported_versions_no_connection_flow_control_.erase(
-        supported_versions_no_connection_flow_control_.begin(),
-        connection_it + 1);
-  }
-  CHECK(!supported_versions_no_connection_flow_control_.empty());
 }
 
 void QuicDispatcher::ProcessPacket(const IPEndPoint& server_address,
@@ -375,27 +361,14 @@ QuicConnection* QuicDispatcher::CreateQuicConnection(
     const IPEndPoint& client_address,
     QuicPerConnectionPacketWriter* writer) {
   QuicConnection* connection;
-  if (FLAGS_enable_quic_connection_flow_control_2) {
-    DVLOG(1) << "Creating QuicDispatcher with all versions.";
-    connection = new QuicConnection(connection_id,
-                                    client_address,
-                                    helper_,
-                                    writer,
-                                    false  /* owns_writer */,
-                                    true   /* is_server */,
-                                    supported_versions_);
-  } else {
-    DVLOG(1) << "Connection flow control disabled, creating QuicDispatcher "
-             << "WITHOUT version 19 or higher.";
-    connection = new QuicConnection(
-        connection_id,
-        client_address,
-        helper_,
-        writer,
-        false  /* owns_writer */,
-        true   /* is_server */,
-        supported_versions_no_connection_flow_control_);
-  }
+  connection = new QuicConnection(
+      connection_id,
+      client_address,
+      helper_,
+      writer,
+      false  /* owns_writer */,
+      true   /* is_server */,
+      supported_versions_);
   writer->set_connection(connection);
   return connection;
 }