Land Recent QUIC Changes.

net/quic/quic_packet_creator.cc

Index: net/quic/quic_packet_creator.cc
diff --git a/net/quic/quic_packet_creator.cc b/net/quic/quic_packet_creator.cc
index f7d2d14a13f9e54e5ea5dc8989539478abe37836..0c40a7ce04dcef38514932fd7ba976e77d078eb6 100644
--- a/net/quic/quic_packet_creator.cc
+++ b/net/quic/quic_packet_creator.cc
@@ -89,11 +89,16 @@ void QuicPacketCreator::OnBuiltFecProtectedPayload(
 }
 
 bool QuicPacketCreator::ShouldSendFec(bool force_close) const {
+  DCHECK(!HasPendingFrames());
   return fec_group_.get() != NULL && fec_group_->NumReceivedPackets() > 0 &&
       (force_close || fec_group_->NumReceivedPackets() >=
                       max_packets_per_fec_group_);
 }
 
+bool QuicPacketCreator::IsFecGroupOpen() const {
+  return ShouldSendFec(true);
+}
+
 void QuicPacketCreator::StartFecProtectingPackets() {
   if (!IsFecEnabled()) {
     LOG(DFATAL) << "Cannot start FEC protection when FEC is not enabled.";
@@ -305,7 +310,7 @@ SerializedPacket QuicPacketCreator::SerializeAllFrames(
   return packet;
 }
 
-bool QuicPacketCreator::HasPendingFrames() {
+bool QuicPacketCreator::HasPendingFrames() const {
   return !queued_frames_.empty();
 }