Deprecate gfe2_reloadable_flag_quic_fix_bytes_left_for_batch_write.
PiperOrigin-RevId: 339310070
Change-Id: If6cb49c3bccfcc6d7a2a87059760430b387beaf4
diff --git a/quic/core/quic_write_blocked_list.cc b/quic/core/quic_write_blocked_list.cc
index b3602a6..eba6a29 100644
--- a/quic/core/quic_write_blocked_list.cc
+++ b/quic/core/quic_write_blocked_list.cc
@@ -149,17 +149,8 @@
if (batch_write_stream_id_[last_priority_popped_] == stream_id) {
// If this was the last data stream popped by PopFront, update the
// bytes remaining in its batch write.
- if (fix_bytes_left_for_batch_write_) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_fix_bytes_left_for_batch_write);
- // TODO(fayang): change this static_cast to static_cast<uint32_t> when
- // deprecating quic_fix_bytes_left_for_batch_write.
- bytes_left_for_batch_write_[last_priority_popped_] -=
- std::min(bytes_left_for_batch_write_[last_priority_popped_],
- static_cast<int32_t>(bytes));
- } else {
- bytes_left_for_batch_write_[last_priority_popped_] -=
- static_cast<int32_t>(bytes);
- }
+ bytes_left_for_batch_write_[last_priority_popped_] -=
+ std::min(bytes_left_for_batch_write_[last_priority_popped_], bytes);
}
}
diff --git a/quic/core/quic_write_blocked_list.h b/quic/core/quic_write_blocked_list.h
index 08f70b3..a89bf17 100644
--- a/quic/core/quic_write_blocked_list.h
+++ b/quic/core/quic_write_blocked_list.h
@@ -104,9 +104,7 @@
// Set to kBatchWriteSize when we set a new batch_write_stream_id_ for a given
// priority. This is decremented with each write the stream does until it is
// done with its batch write.
- // TODO(fayang): switch this to uint32_t when deprecating
- // quic_fix_bytes_left_for_batch_write.
- int32_t bytes_left_for_batch_write_[spdy::kV3LowestPriority + 1];
+ size_t bytes_left_for_batch_write_[spdy::kV3LowestPriority + 1];
// Tracks the last priority popped for UpdateBytesForStream.
spdy::SpdyPriority last_priority_popped_;
@@ -156,9 +154,6 @@
StaticStreamCollection static_stream_collection_;
spdy::WriteSchedulerType scheduler_type_;
-
- const bool fix_bytes_left_for_batch_write_ =
- GetQuicReloadableFlag(quic_fix_bytes_left_for_batch_write);
};
} // namespace quic
