Land Recent QUIC Changes until 2/21/2015.

net/quic/quic_packet_generator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_packet_generator.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/quic/quic_ack_notifier.h"
 #include "net/quic/quic_fec_group.h"
@@ skipping 154 matching lines @@
   int frames_created = 0;
   while (delegate_->ShouldGeneratePacket(
       NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA,
       has_handshake ? IS_HANDSHAKE : NOT_HANDSHAKE)) {
     QuicFrame frame;
     size_t bytes_consumed = packet_creator_.CreateStreamFrame(
         id, data, offset + total_bytes_consumed, fin, &frame);
     ++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)) {
       LOG(DFATAL) << "Failed to add stream frame.";
       // Inability to add a STREAM frame creates an unrecoverable hole in a
       // the stream, so it's best to close the connection.
       delegate_->CloseConnection(QUIC_INTERNAL_ERROR, false);
       delete notifier;
       return QuicConsumedData(0, false);
     }
@@ skipping 202 matching lines @@
     debug_delegate_->OnFrameAddedToPacket(frame);
   }
   return success;
 }
 
 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();
-  }
+  serialized_packet.notifiers.swap(ack_notifiers_);
+  ack_notifiers_.clear();
 
   delegate_->OnSerializedPacket(serialized_packet);
   MaybeSendFecPacketAndCloseGroup(/*force=*/false);
 
   // The packet has now been serialized, so the frames are no longer queued.
   ack_queued_ = false;
   stop_waiting_queued_ = false;
 }
 
 void QuicPacketGenerator::StopSendingVersion() {
@@ skipping 41 matching lines @@
     packet_creator_.set_connection_id_length(PACKET_8BYTE_CONNECTION_ID);
   }
 }
 
 
 void QuicPacketGenerator::set_encryption_level(EncryptionLevel level) {
   packet_creator_.set_encryption_level(level);
 }
 
 }  // namespace net