Land Recent QUIC Changes

net/quic/quic_packet_generator.cc

Index: net/quic/quic_packet_generator.cc
diff --git a/net/quic/quic_packet_generator.cc b/net/quic/quic_packet_generator.cc
index d3de9b55b33e7406a2e8eb8bbf850b5efd6aa11e..87464f7800c26becf29bcac41726b4a76e119903 100644
--- a/net/quic/quic_packet_generator.cc
+++ b/net/quic/quic_packet_generator.cc
@@ -72,8 +72,9 @@ QuicConsumedData QuicPacketGenerator::ConsumeData(QuicStreamId id,
 
   size_t total_bytes_consumed = 0;
   bool fin_consumed = false;
+  bool has_retransmittable_data = true;
 
-  while (delegate_->CanWrite(false)) {
+  while (delegate_->CanWrite(false, has_retransmittable_data)) {
     // TODO(rch) figure out FEC.
     // packet_creator_.MaybeStartFEC();
     QuicFrame frame;
@@ -113,7 +114,8 @@ QuicConsumedData QuicPacketGenerator::ConsumeData(QuicStreamId id,
 }
 
 void QuicPacketGenerator::SendQueuedData() {
-  while (HasPendingData() && delegate_->CanWrite(false)) {
+  while (HasPendingData() &&
+         delegate_->CanWrite(false, packet_creator_->HasPendingFrames())) {
     if (!AddNextPendingFrame()) {
       // Packet was full, so serialize and send it.
       SerializeAndSendPacket();