Deprecate rolled out FLAGS_enable_quic_connection_flow_control_2.

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 9980674fb24a0416bbf08b073c31befa22cf63d4..cf3a46b3bf0a38e343bdedb3f06cf10e382c3186 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_connection_flow_control_(supported_versions),
       current_packet_(NULL),
       framer_(supported_versions, /*unused*/ QuicTime::Zero(), true),
       framer_visitor_(new QuicFramerVisitor(this)) {
@@ -185,18 +184,6 @@ void QuicDispatcher::Initialize(int fd) {
   DCHECK(writer_ == NULL);
   writer_.reset(CreateWriter(fd));
   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,
@@ -376,26 +363,13 @@ QuicConnection* QuicDispatcher::CreateQuicConnection(
     QuicConnectionId connection_id,
     const IPEndPoint& server_address,
     const IPEndPoint& client_address) {
-  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(),
-                              false  /* owns_writer */,
-                              true   /* is_server */,
-                              supported_versions_);
-  }
-
-  DLOG(INFO) << "Connection flow control disabled, creating QuicDispatcher "
-             << "WITHOUT version 19 or higher.";
   return new QuicConnection(connection_id,
                             client_address,
                             helper_.get(),
                             writer_.get(),
                             false  /* owns_writer */,
                             true   /* is_server */,
-                            supported_versions_no_connection_flow_control_);
+                            supported_versions_);
 }
 
 QuicTimeWaitListManager* QuicDispatcher::CreateQuicTimeWaitListManager() {