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 74617ef602e2855d79a455547655597f1f3dc627..a7f0af08ade11a8577f4d79ce4ca5ddd1f1f281e 100644
--- a/net/quic/quic_packet_generator.cc
+++ b/net/quic/quic_packet_generator.cc
@@ -183,7 +183,13 @@ QuicConsumedData QuicPacketGenerator::ConsumeData(
     ++frames_created;
 
     // We want to track which packet this stream frame ends up in.
-    frame.stream_frame->notifier = notifier;
+    if (FLAGS_quic_attach_ack_notifiers_to_packets) {
+      if (notifier != nullptr) {
+        ack_notifiers_.insert(notifier);
+      }
+    } else {
+      frame.stream_frame->notifier = notifier;
+    }
 
     if (!AddFrame(frame)) {
       LOG(DFATAL) << "Failed to add stream frame.";
@@ -389,6 +395,13 @@ bool QuicPacketGenerator::AddFrame(const QuicFrame& frame) {
 void QuicPacketGenerator::SerializeAndSendPacket() {
   SerializedPacket serialized_packet = packet_creator_.SerializePacket();
   DCHECK(serialized_packet.packet);
+
+  // There may be AckNotifiers interested in this packet.
+  if (FLAGS_quic_attach_ack_notifiers_to_packets) {
+    serialized_packet.notifiers.swap(ack_notifiers_);
+    ack_notifiers_.clear();
+  }
+
   delegate_->OnSerializedPacket(serialized_packet);
   MaybeSendFecPacketAndCloseGroup(false);