Land Recent QUIC changes.

net/tools/quic/quic_reliable_server_stream_test.cc

Index: net/tools/quic/quic_reliable_server_stream_test.cc
diff --git a/net/tools/quic/quic_reliable_server_stream_test.cc b/net/tools/quic/quic_reliable_server_stream_test.cc
index 8e4ae4c94eebc1b7032589b35b73e2d415abd0e9..53533a35cb1cb5584db16e45fa4d5fcf236b1104 100644
--- a/net/tools/quic/quic_reliable_server_stream_test.cc
+++ b/net/tools/quic/quic_reliable_server_stream_test.cc
@@ -121,10 +121,13 @@ class QuicReliableServerStreamTest : public ::testing::Test {
   string body_;
 };
 
-QuicConsumedData ConsumeAllData(QuicStreamId id, const struct iovec* iov,
-                                int count, QuicStreamOffset offset, bool fin) {
+QuicConsumedData ConsumeAllData(QuicStreamId id,
+                                const struct iovec* iov,
+                                int iov_count,
+                                QuicStreamOffset offset,
+                                bool fin) {
   ssize_t consumed_length = 0;
-  for (int i = 0; i < count; ++i) {
+  for (int i = 0; i < iov_count; ++i) {
     consumed_length += iov[i].iov_len;
   }
   return QuicConsumedData(consumed_length, fin);