Land Recent QUIC changes.

net/quic/quic_connection.cc

Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index 5cc97c19ebb005e666e75d0c8ea3904d0f688e85..748821e445e844a01a78410d03208df7a06fd762 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -190,6 +190,7 @@ QuicConnection::QuicConnection(QuicGuid guid,
 }
 
 QuicConnection::~QuicConnection() {
+  STLDeleteElements(&ack_notifiers_);
   STLDeleteElements(&undecryptable_packets_);
   STLDeleteValues(&unacked_packets_);
   STLDeleteValues(&group_map_);
@@ -456,6 +457,23 @@ void QuicConnection::ProcessAckFrame(const QuicAckFrame& incoming_ack) {
   HandleAckForSentFecPackets(incoming_ack, &acked_packets);
   if (acked_packets.size() > 0) {
     visitor_->OnAck(acked_packets);
+
+    // Inform all the registered AckNotifiers of the new ACKs.
+    // TODO(rjshade): Make this more efficient by maintaining a mapping of
+    //                <sequence number, set<AckNotifierList>> so that OnAck
+    //                is only called on AckNotifiers that care about the
+    //                packets being ACKed.
+    AckNotifierList::iterator it = ack_notifiers_.begin();
+    while (it != ack_notifiers_.end()) {
+      if ((*it)->OnAck(acked_packets)) {
+        // The QuicAckNotifier has seen all the ACKs it was interested in, and
+        // has triggered its callback. No more use for it.
+        delete *it;
+        it = ack_notifiers_.erase(it);
+      } else {
+        ++it;
+      }
+    }
   }
   congestion_manager_.OnIncomingAckFrame(incoming_ack,
                                          time_of_last_received_packet_);
@@ -821,6 +839,30 @@ QuicConsumedData QuicConnection::SendStreamData(QuicStreamId id,
   return consumed_data;
 }
 
+QuicConsumedData QuicConnection::SendStreamDataAndNotifyWhenAcked(
+    QuicStreamId id,
+    StringPiece data,
+    QuicStreamOffset offset,
+    bool fin,
+    QuicAckNotifier::DelegateInterface* delegate) {
+  // This notifier will be deleted in ProcessAckFrame once it has seen ACKs for
+  // all the consumed data (or below if no data was consumed).
+  QuicAckNotifier* notifier = new QuicAckNotifier(delegate);
+  QuicConsumedData consumed_data =
+      packet_generator_.ConsumeData(id, data, offset, fin, notifier);
+
+  if (consumed_data.bytes_consumed > 0) {
+    // If some data was consumed, then the delegate should be registered for
+    // notification when the data is ACKed.
+    ack_notifiers_.push_back(notifier);
+  } else {
+    // No data was consumed, delete the notifier.
+    delete notifier;
+  }
+
+  return consumed_data;
+}
+
 void QuicConnection::SendRstStream(QuicStreamId id,
                                    QuicRstStreamErrorCode error) {
   LOG(INFO) << "Sending RST_STREAM: " << id << " code: " << error;
@@ -1062,14 +1104,23 @@ void QuicConnection::RetransmitPacket(
   // Remove info with old sequence number.
   unacked_packets_.erase(unacked_it);
   retransmission_map_.erase(retransmission_it);
-  DVLOG(1) << ENDPOINT << "Retransmitting unacked packet " << sequence_number
-           << " as " << serialized_packet.sequence_number;
+  DLOG(INFO) << ENDPOINT << "Retransmitting unacked packet " << sequence_number
+             << " as " << serialized_packet.sequence_number;
   DCHECK(unacked_packets_.empty() ||
          unacked_packets_.rbegin()->first < serialized_packet.sequence_number);
   unacked_packets_.insert(make_pair(serialized_packet.sequence_number,
                                     unacked));
   retransmission_map_.insert(make_pair(serialized_packet.sequence_number,
                                        retransmission_info));
+
+  // A notifier may be waiting to hear about ACKs for the original sequence
+  // number. Inform them that the sequence number has changed.
+  for (AckNotifierList::iterator notifier_it = ack_notifiers_.begin();
+       notifier_it != ack_notifiers_.end(); ++notifier_it) {
+    (*notifier_it)->UpdateSequenceNumber(sequence_number,
+                                         serialized_packet.sequence_number);
+  }
+
   if (debug_visitor_) {
     debug_visitor_->OnPacketRetransmitted(sequence_number,
                                           serialized_packet.sequence_number);