Land Recent QUIC Changes.

net/quic/quic_headers_stream_test.cc

Index: net/quic/quic_headers_stream_test.cc
diff --git a/net/quic/quic_headers_stream_test.cc b/net/quic/quic_headers_stream_test.cc
index 4d97a7a960b0dfd3d3b7ba861ab72804de3c68cc..39764f6c1749f3ff879df56b7af618b03ee27cea 100644
--- a/net/quic/quic_headers_stream_test.cc
+++ b/net/quic/quic_headers_stream_test.cc
@@ -82,7 +82,9 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> {
     EXPECT_TRUE(headers_stream_ != NULL);
   }
 
-  QuicConsumedData SaveIov(const struct iovec* iov, int count) {
+  QuicConsumedData SaveIov(const IOVector& data) {
+    const iovec* iov = data.iovec();
+    int count = data.Capacity();
     for (int i = 0 ; i < count; ++i) {
       saved_data_.append(static_cast<char*>(iov[i].iov_base), iov[i].iov_len);
     }
@@ -114,9 +116,8 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> {
                                 QuicPriority priority,
                                 SpdyFrameType type) {
     // Write the headers and capture the outgoing data
-    EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, _, _, false, NULL))
-        .WillOnce(WithArgs<1, 2>(
-            Invoke(this, &QuicHeadersStreamTest::SaveIov)));
+    EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, _, false, NULL))
+        .WillOnce(WithArgs<1>(Invoke(this, &QuicHeadersStreamTest::SaveIov)));
     headers_stream_->WriteHeaders(stream_id, headers_, fin);
 
     // Parse the outgoing data and check that it matches was was written.