Land Recent QUIC changes.

net/tools/quic/quic_reliable_server_stream_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_reliable_server_stream.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_spdy_compressor.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
@@ skipping 103 matching lines @@
   }
 
   BalsaHeaders response_headers_;
   EpollServer eps_;
   StrictMock<MockSession> session_;
   scoped_ptr<QuicReliableServerStream> stream_;
   string headers_string_;
   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);
 }
 
 TEST_F(QuicReliableServerStreamTest, TestFraming) {
   EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
       WillRepeatedly(Invoke(ConsumeAllData));
 
   EXPECT_EQ(headers_string_.size(), stream_->ProcessData(
@@ skipping 78 matching lines @@
 
   stream_->SendErrorResponse();
   EXPECT_TRUE(stream_->read_side_closed());
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net