Land Recent QUIC changes.

net/quic/quic_connection.h

Index: net/quic/quic_connection.h
diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h
index 634736db786a19b4dfbf33850fbcb60575ccdaa4..522d15b0f087a0d52e6b578e273ee35d0e962056 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -705,6 +705,9 @@ class NET_EXPORT_PRIVATE QuicConnection
   // An alarm that is scheduled when the sent scheduler requires a
   // a delay before sending packets and fires when the packet may be sent.
   scoped_ptr<QuicAlarm> send_alarm_;
+  // An alarm that is scheduled when the connection can still write and there
+  // may be more data to send.
+  scoped_ptr<QuicAlarm> resume_writes_alarm_;
   // An alarm that fires when the connection may have timed out.
   scoped_ptr<QuicAlarm> timeout_alarm_;
 
@@ -730,6 +733,11 @@ class NET_EXPORT_PRIVATE QuicConnection
   // The time that we last sent a packet for this connection.
   QuicTime time_of_last_sent_packet_;
 
+  // Sequence number of the last packet guaranteed to be sent in packet sequence
+  // number order.  Not set when packets are queued, since that may cause
+  // re-ordering.
+  QuicPacketSequenceNumber sequence_number_of_last_inorder_packet_;
+
   // Congestion manager which controls the rate the connection sends packets
   // as well as collecting and generating congestion feedback.
   QuicCongestionManager congestion_manager_;
@@ -760,11 +768,6 @@ class NET_EXPORT_PRIVATE QuicConnection
   // This is checked later on validating a data or version negotiation packet.
   bool address_migrating_;
 
-  // An AckNotifier can register to be informed when ACKs have been received for
-  // all packets that a given block of data was sent in. The AckNotifierManager
-  // maintains the currently active notifiers.
-  AckNotifierManager ack_notifier_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicConnection);
 };