Land Recent QUIC Changes until 2/21/2015.

net/quic/quic_ack_notifier_manager.cc

 // Copyright 2013 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_ack_notifier_manager.h"
 
 #include <stddef.h>
 #include <list>
 #include <map>
 #include <utility>
@@ skipping 58 matching lines @@
   }
 
   // The old sequence number is no longer of interest, copy the updated
   // AckNotifiers to the new sequence number before deleting the old.
   ack_notifier_map_[new_sequence_number] = ack_notifier_list;
   ack_notifier_map_.erase(map_it);
 }
 
 void AckNotifierManager::OnSerializedPacket(
     const SerializedPacket& serialized_packet) {
-  if (FLAGS_quic_attach_ack_notifiers_to_packets) {
-    // Inform each attached AckNotifier of the packet's serialization.
-    AckNotifierList& notifier_list =
-        ack_notifier_map_[serialized_packet.sequence_number];
-    for (QuicAckNotifier* notifier : serialized_packet.notifiers) {
-      if (notifier == nullptr) {
-        LOG(DFATAL) << "AckNotifier should not be nullptr.";
-        continue;
-      }
-      notifier->OnSerializedPacket();
-
-      // Update the mapping in the other direction, from sequence number to
-      // AckNotifier.
-      notifier_list.push_back(notifier);
+  // Inform each attached AckNotifier of the packet's serialization.
+  AckNotifierList& notifier_list =
+      ack_notifier_map_[serialized_packet.sequence_number];
+  for (QuicAckNotifier* notifier : serialized_packet.notifiers) {
+    if (notifier == nullptr) {
+      LOG(DFATAL) << "AckNotifier should not be nullptr.";
+      continue;
     }
-  } else {
-    // AckNotifiers can only be attached to retransmittable frames.
-    RetransmittableFrames* frames = serialized_packet.retransmittable_frames;
-    if (frames == nullptr) {
-      return;
-    }
-
-    // For each frame in |serialized_packet|, inform any attached AckNotifiers
-    // of the packet's sequence number.
-    for (const QuicFrame& quic_frame : frames->frames()) {
-      if (quic_frame.type != STREAM_FRAME ||
-          quic_frame.stream_frame->notifier == nullptr) {
-        continue;
-      }
-
-      QuicAckNotifier* notifier = quic_frame.stream_frame->notifier;
-      notifier->OnSerializedPacket();
-
-      // Update the mapping in the other direction, from sequence number to
-      // AckNotifier.
-      ack_notifier_map_[serialized_packet.sequence_number].push_back(notifier);
-    }
+    notifier->OnSerializedPacket();
+    notifier_list.push_back(notifier);
   }
 }
 
 }  // namespace net