Land Recent QUIC changes.

net/quic/reliable_quic_stream.h

 // 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.
 //
 // The base class for client/server reliable streams.
 
 #ifndef NET_QUIC_RELIABLE_QUIC_STREAM_H_
 #define NET_QUIC_RELIABLE_QUIC_STREAM_H_
 
 #include <sys/types.h>
@@ skipping 149 matching lines @@
   QuicConsumedData WriteOrBuffer(base::StringPiece data, bool fin);
 
   // Sends as much of 'data' to the connection as the connection will consume.
   // Returns the number of bytes consumed by the connection.
   QuicConsumedData WriteDataInternal(base::StringPiece data, bool fin);
 
   // Sends as many bytes in the first |count| buffers of |iov| to the connection
   // as the connection will consume.
   // Returns the number of bytes consumed by the connection.
   QuicConsumedData WritevDataInternal(const struct iovec* iov,
-                                      int count,
+                                      int iov_count,
                                       bool fin);
 
  private:
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
 
   uint32 StripPriorityAndHeaderId(const char* data, uint32 data_len);
 
   std::list<string> queued_data_;
 
@@ skipping 36 matching lines @@
 
   // True if the priority has been read, false otherwise.
   bool priority_parsed_;
   bool fin_buffered_;
   bool fin_sent_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_RELIABLE_QUIC_STREAM_H_