Landing Recent QUIC changes until 7/18/2016 11:21:53 UTC

net/quic/quic_crypto_server_stream.cc

Index: net/quic/quic_crypto_server_stream.cc
diff --git a/net/quic/quic_crypto_server_stream.cc b/net/quic/quic_crypto_server_stream.cc
index d222fe30ba16d6243ab55ddf440a1071e0dd31a3..a2f1a0d22260eb4e1bf788d49bc9a086f20c9ef0 100644
--- a/net/quic/quic_crypto_server_stream.cc
+++ b/net/quic/quic_crypto_server_stream.cc
@@ -481,13 +481,11 @@ void QuicCryptoServerStream::ValidateCallback::RunImpl(
 
 QuicConnectionId QuicCryptoServerStream::GenerateConnectionIdForReject(
     QuicConnectionId connection_id) {
-  // TODO(rch): Remove this method when this flag is removed.
-  if (FLAGS_quic_dispatcher_creates_id) {
-    QuicServerSessionBase* session_base =
-        static_cast<QuicServerSessionBase*>(session());
-    return session_base->GenerateConnectionIdForReject(connection_id);
-  }
-  return session()->connection()->random_generator()->RandUint64();
+  // TODO(rch): Remove this method when
+  // reloadable_flag_quic_dispatcher_creates_id2 is removed.
+  QuicServerSessionBase* session_base =
+      static_cast<QuicServerSessionBase*>(session());
+  return session_base->GenerateConnectionIdForReject(connection_id);
 }
 
 }  // namespace net