Landing Recent QUIC changes until 8/24/2015 18:33 UTC.

relnote: Rename "sequence number" to "packet number" in the QUIC code.

Merge internal change: 101368603
https://codereview.chromium.org/1321603002/

relnote: Fixes a crash bug where when two packets were sent when write
blocked, the second would sometimes succeed and then writes occurred out
of order.

Merge internal change: 101355922
https://codereview.chromium.org/1313373003/

relnote: Update QUIC's fec_alarm with a 1ms granularity to avoid setting
it so often.

Setting this alarm currently consumes over 1% of CPU on bandaid, even
though FEC is disabled for most users.

Merge internal change: 101213426
https://codereview.chromium.org/1322433004/

QUIC - small changes to keep the code similar to internal source.

Internal release not:

Add required header file and fully qualify std::max() and std::min().
These are currently implicitly included through base/scoped_ptr.h, which
is going away.

relnote: n/a (compilation fix in QUIC strike register)

Merge internal change: 101113179
https://codereview.chromium.org/1315253002/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/1317113003

Cr-Commit-Position: refs/heads/master@{#346090}

1 files changed, 8 insertions, 9 deletions

diff --git a/net/quic/congestion_control/hybrid_slow_start.h b/net/quic/congestion_control/hybrid_slow_start.h
index 9f0a9ae..457ef3e 100644
--- a/net/quic/congestion_control/hybrid_slow_start.h
+++ b/net/quic/congestion_control/hybrid_slow_start.h
@@ -27,10 +27,9 @@ class NET_EXPORT_PRIVATE HybridSlowStart {
  public:
   HybridSlowStart();
 
-  void OnPacketAcked(QuicPacketSequenceNumber acked_sequence_number,
-                     bool in_slow_start);
+  void OnPacketAcked(QuicPacketNumber acked_packet_number, bool in_slow_start);
 
-  void OnPacketSent(QuicPacketSequenceNumber sequence_number);
+  void OnPacketSent(QuicPacketNumber packet_number);
 
   // ShouldExitSlowStart should be called on every new ack frame, since a new
   // RTT measurement can be made then.
@@ -46,13 +45,13 @@ class NET_EXPORT_PRIVATE HybridSlowStart {
 
   // TODO(ianswett): The following methods should be private, but that requires
   // a follow up CL to update the unit test.
-  // Returns true if this ack the last sequence number of our current slow start
+  // Returns true if this ack the last packet number of our current slow start
   // round.
   // Call Reset if this returns true.
-  bool IsEndOfRound(QuicPacketSequenceNumber ack) const;
+  bool IsEndOfRound(QuicPacketNumber ack) const;
 
   // Call for the start of each receive round (burst) in the slow start phase.
-  void StartReceiveRound(QuicPacketSequenceNumber last_sent);
+  void StartReceiveRound(QuicPacketNumber last_sent);
 
   // Whether slow start has started.
   bool started() const {
@@ -69,11 +68,11 @@ class NET_EXPORT_PRIVATE HybridSlowStart {
   // Whether the hybrid slow start has been started.
   bool started_;
   HystartState hystart_found_;
-  // Last sequence number sent which was CWND limited.
-  QuicPacketSequenceNumber last_sent_sequence_number_;
+  // Last packet number sent which was CWND limited.
+  QuicPacketNumber last_sent_packet_number_;
 
   // Variables for tracking acks received during a slow start round.
-  QuicPacketSequenceNumber end_sequence_number_;  // End of the receive round.
+  QuicPacketNumber end_packet_number_;  // End of the receive round.
   uint32 rtt_sample_count_;  // Number of rtt samples in the current round.
   QuicTime::Delta current_min_rtt_;  // The minimum rtt of current round.