commit a178671266795d2f3dfbe05046e08f179be0133c
author renjietang <renjietang@google.com> Mon Sep 09 11:23:46 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Sep 10 10:51:35 2019 -0700
tree 27bfa14ef56109c7f5b75efd9676850f1349e1ad
parent d4ddf717932c657c5e7dbc597d612ffe64034a7b

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_handle_staticness_for_spdy_stream.

PiperOrigin-RevId: 268038248
Change-Id: I5915c18b962949e87d50e4632d694a9364676101

quic/core/http/quic_spdy_session.cc

diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index 0b42f09..98d4c46 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -601,23 +601,19 @@
 QuicSpdyStream* QuicSpdySession::GetSpdyDataStream(
     const QuicStreamId stream_id) {
   QuicStream* stream = nullptr;
-  if (GetQuicReloadableFlag(quic_inline_getorcreatedynamicstream) &&
-      GetQuicReloadableFlag(quic_handle_staticness_for_spdy_stream)) {
+  if (GetQuicReloadableFlag(quic_inline_getorcreatedynamicstream)) {
     QUIC_RELOADABLE_FLAG_COUNT(quic_inline_getorcreatedynamicstream);
     stream = GetOrCreateStream(stream_id);
   } else {
     stream = GetOrCreateDynamicStream(stream_id);
   }
-  if (GetQuicReloadableFlag(quic_handle_staticness_for_spdy_stream) && stream &&
-      stream->is_static()) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_handle_staticness_for_spdy_stream);
+  if (stream && stream->is_static()) {
     QUIC_BUG << "GetSpdyDataStream returns static stream";
     connection()->CloseConnection(
         QUIC_INVALID_STREAM_ID, "stream is static",
         ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
     return nullptr;
   }
-  DCHECK(!stream || !stream->is_static());
   return static_cast<QuicSpdyStream*>(stream);
 }
 

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 619840b..1ad070d 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1335,8 +1335,7 @@
 
 QuicStream* QuicSession::GetOrCreateDynamicStream(
     const QuicStreamId stream_id) {
-  DCHECK(!GetQuicReloadableFlag(quic_inline_getorcreatedynamicstream) ||
-         !GetQuicReloadableFlag(quic_handle_staticness_for_spdy_stream));
+  DCHECK(!GetQuicReloadableFlag(quic_inline_getorcreatedynamicstream));
   StreamMap::iterator it = stream_map_.find(stream_id);
   if (it != stream_map_.end()) {
     return it->second.get();