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, 9 insertions, 11 deletions

diff --git a/net/tools/quic/quic_server_test.cc b/net/tools/quic/quic_server_test.cc
index c73464a..5c85d2e 100644
--- a/net/tools/quic/quic_server_test.cc
+++ b/net/tools/quic/quic_server_test.cc
@@ -43,17 +43,15 @@ class QuicServerDispatchPacketTest : public ::testing::Test {
 };
 
 TEST_F(QuicServerDispatchPacketTest, DispatchPacket) {
-  unsigned char valid_packet[] = {
-    // public flags (8 byte connection_id)
-    0x3C,
-    // connection_id
-    0x10, 0x32, 0x54, 0x76,
-    0x98, 0xBA, 0xDC, 0xFE,
-    // packet sequence number
-    0xBC, 0x9A, 0x78, 0x56,
-    0x34, 0x12,
-    // private flags
-    0x00 };
+  unsigned char valid_packet[] = {// public flags (8 byte connection_id)
+                                  0x3C,
+                                  // connection_id
+                                  0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC,
+                                  0xFE,
+                                  // packet number
+                                  0xBC, 0x9A, 0x78, 0x56, 0x34, 0x12,
+                                  // private flags
+                                  0x00};
   QuicEncryptedPacket encrypted_valid_packet(QuicUtils::AsChars(valid_packet),
                                              arraysize(valid_packet), false);