Landing Recent QUIC changes until 3:35 PM, Apr 26, 2017 UTC-4

net/quic/core/quic_packet_generator.cc

Index: net/quic/core/quic_packet_generator.cc
diff --git a/net/quic/core/quic_packet_generator.cc b/net/quic/core/quic_packet_generator.cc
index dc68d253096c31b16e6fd5627768b4b677260f6d..7487cde8fa47ded9ea21d04bcbad7b07cbb4f852 100644
--- a/net/quic/core/quic_packet_generator.cc
+++ b/net/quic/core/quic_packet_generator.cc
@@ -348,4 +348,9 @@ void QuicPacketGenerator::SendRemainingPendingPadding() {
   }
 }
 
+bool QuicPacketGenerator::HasRetransmittableFrames() const {
+  return !queued_control_frames_.empty() ||
+         packet_creator_.HasPendingRetransmittableFrames();
+}
+
 }  // namespace net