Land Recent QUIC Changes.

net/quic/quic_packet_creator.h

Index: net/quic/quic_packet_creator.h
diff --git a/net/quic/quic_packet_creator.h b/net/quic/quic_packet_creator.h
index 35b5b756c34b9fbd431347763b035c52ad9c12aa..5ff65822d3714a7a99fe262d71f510a2bc392649 100644
--- a/net/quic/quic_packet_creator.h
+++ b/net/quic/quic_packet_creator.h
@@ -107,6 +107,7 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
   // Returns true if there are retransmittable frames pending to be serialized.
   bool HasPendingRetransmittableFrames() const;
 
+  // TODO(jri): Remove this method.
   // Returns whether FEC protection is currently enabled. Note: Enabled does not
   // mean that an FEC group is currently active; i.e., IsFecProtected() may
   // still return false.
@@ -222,6 +223,11 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
   // To turn off FEC protection, use StopFecProtectingPackets().
   void set_max_packets_per_fec_group(size_t max_packets_per_fec_group);
 
+  // Returns the currently open FEC group's number. If there isn't an open FEC
+  // group, returns the last closed FEC group number. Returns 0 when FEC is
+  // disabled or no FEC group has been created yet.
+  QuicFecGroupNumber fec_group_number() { return fec_group_number_; }
+
  private:
   friend class test::QuicPacketCreatorPeer;