Land Recent QUIC changes.

net/quic/quic_stream_sequencer.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.
 
 #ifndef NET_QUIC_QUIC_STREAM_SEQUENCER_H_
 #define NET_QUIC_QUIC_STREAM_SEQUENCER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 41 matching lines @@
   // Wait until we've seen 'offset' bytes, and then terminate the stream.
   // TODO(ianswett): Simplify this method by removing half_close, now that
   // the sequencer is bypassed for stream resets and half_close is always true.
   void CloseStreamAtOffset(QuicStreamOffset offset, bool half_close);
 
   // Once data is buffered, it's up to the stream to read it when the stream
   // can handle more data.  The following three functions make that possible.
 
   // Fills in up to iov_len iovecs with the next readable regions.  Returns the
   // number of iovs used.  Non-destructive of the underlying data.
-  int GetReadableRegions(iovec* iov, int iov_len);
+  int GetReadableRegions(iovec* iov, size_t iov_len);
 
   // Copies the data into the iov_len buffers provided.  Returns the number of
   // bytes read.  Any buffered data no longer in use will be released.
-  int Readv(const struct iovec* iov, int iov_len);
+  int Readv(const struct iovec* iov, size_t iov_len);
 
   // Consumes |num_bytes| data.  Used in conjunction with |GetReadableRegions|
   // to do zero-copy reads.
   void MarkConsumed(size_t num_bytes);
 
   // Returns true if the sequncer has bytes available for reading.
   bool HasBytesToRead() const;
 
   // Returns true if the sequencer has delivered a half close.
   bool IsHalfClosed() const;
@@ skipping 25 matching lines @@
   // the half_close_ bool.
   QuicStreamOffset close_offset_;
   // Only valid if close_offset_ is set.  Indicates if it's a half or a full
   // close.
   bool half_close_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_SEQUENCER_H_