Land Recent QUIC changes.

net/quic/reliable_quic_stream.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/quic/reliable_quic_stream.h"
 
 #include "net/quic/quic_session.h"
 #include "net/quic/quic_spdy_decompressor.h"
 
 using base::StringPiece;
@@ skipping 80 matching lines @@
     CloseWriteSide();
   }
   CloseReadSide();
 }
 
 void ReliableQuicStream::Close(QuicRstStreamErrorCode error) {
   stream_error_ = error;
   session()->SendRstStream(id(), error);
 }
 
-int ReliableQuicStream::Readv(const struct iovec* iov, int iov_len) {
+int ReliableQuicStream::Readv(const struct iovec* iov, size_t iov_len) {
   if (headers_decompressed_ && decompressed_headers_.empty()) {
     return sequencer_.Readv(iov, iov_len);
   }
   size_t bytes_consumed = 0;
-  int iov_index = 0;
+  size_t iov_index = 0;
   while (iov_index < iov_len &&
          decompressed_headers_.length() > bytes_consumed) {
     int bytes_to_read = min(iov[iov_index].iov_len,
                             decompressed_headers_.length() - bytes_consumed);
     char* iov_ptr = static_cast<char*>(iov[iov_index].iov_base);
     memcpy(iov_ptr,
            decompressed_headers_.data() + bytes_consumed, bytes_to_read);
     bytes_consumed += bytes_to_read;
     ++iov_index;
   }
   decompressed_headers_.erase(0, bytes_consumed);
   return bytes_consumed;
 }
 
-int ReliableQuicStream::GetReadableRegions(iovec* iov, int iov_len) {
+int ReliableQuicStream::GetReadableRegions(iovec* iov, size_t iov_len) {
   if (headers_decompressed_ && decompressed_headers_.empty()) {
     return sequencer_.GetReadableRegions(iov, iov_len);
   }
   if (iov_len == 0) {
     return 0;
   }
   iov[0].iov_base = static_cast<void*>(
       const_cast<char*>(decompressed_headers_.data()));
   iov[0].iov_len = decompressed_headers_.length();
   return 1;
@@ skipping 262 matching lines @@
   if (visitor_) {
     Visitor* visitor = visitor_;
     // Calling Visitor::OnClose() may result the destruction of the visitor,
     // so we need to ensure we don't call it again.
     visitor_ = NULL;
     visitor->OnClose(this);
   }
 }
 
 }  // namespace net