Land Recent QUIC Changes until 2/21/2015.

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 4058efa6e555338273cbc4ea8a08f4c1a02cd8ae..57495678d94371b7e335b71d121c240b5857537b 100644
--- a/net/quic/quic_packet_generator.cc
+++ b/net/quic/quic_packet_generator.cc
@@ -172,12 +172,8 @@ QuicConsumedData QuicPacketGenerator::ConsumeData(
     ++frames_created;
 
     // We want to track which packet this stream frame ends up in.
-    if (FLAGS_quic_attach_ack_notifiers_to_packets) {
-      if (notifier != nullptr) {
-        ack_notifiers_.push_back(notifier);
-      }
-    } else {
-      frame.stream_frame->notifier = notifier;
+    if (notifier != nullptr) {
+      ack_notifiers_.push_back(notifier);
     }
 
     if (!AddFrame(frame)) {
@@ -400,10 +396,8 @@ void QuicPacketGenerator::SerializeAndSendPacket() {
   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();
-  }
+  serialized_packet.notifiers.swap(ack_notifiers_);
+  ack_notifiers_.clear();
 
   delegate_->OnSerializedPacket(serialized_packet);
   MaybeSendFecPacketAndCloseGroup(/*force=*/false);