Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.h

Index: net/tools/quic/quic_dispatcher.h
diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h
index 088de311af3a27fe490cc60c7e551e970a6789df..8d7b03b1e14b22c9f99a490057d82daa05547d55 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -144,11 +144,6 @@ class QuicDispatcher : public QuicServerSessionVisitor,
     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_;
   }
@@ -215,14 +210,6 @@ class QuicDispatcher : public QuicServerSessionVisitor,
   // 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_;