Land Recent QUIC Changes.

net/quic/reliable_quic_stream.cc

Index: net/quic/reliable_quic_stream.cc
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 0b14693e1181a5cfde569485320d9df7215dd534..c3dcf4016d96cce892c654f5086908ff5c6f6eef 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -255,12 +255,14 @@ QuicConsumedData ReliableQuicStream::WriteDataInternal(
     StringPiece data, bool fin) {
   struct iovec iov = {const_cast<char*>(data.data()),
                       static_cast<size_t>(data.size())};
-  return WritevDataInternal(&iov, 1, fin);
+  return WritevDataInternal(&iov, 1, fin, NULL);
 }
 
-QuicConsumedData ReliableQuicStream::WritevDataInternal(const struct iovec* iov,
-                                                        int iov_count,
-                                                        bool fin) {
+QuicConsumedData ReliableQuicStream::WritevDataInternal(
+    const struct iovec* iov,
+    int iov_count,
+    bool fin,
+    QuicAckNotifier::DelegateInterface* ack_notifier_delegate) {
   if (write_side_closed_) {
     DLOG(ERROR) << ENDPOINT << "Attempt to write when the write side is closed";
     return QuicConsumedData(0, false);
@@ -270,8 +272,8 @@ QuicConsumedData ReliableQuicStream::WritevDataInternal(const struct iovec* iov,
   for (int i = 0; i < iov_count; ++i) {
     write_length += iov[i].iov_len;
   }
-  QuicConsumedData consumed_data =
-      session()->WritevData(id(), iov, iov_count, stream_bytes_written_, fin);
+  QuicConsumedData consumed_data = session()->WritevData(
+      id(), iov, iov_count, stream_bytes_written_, fin, ack_notifier_delegate);
   stream_bytes_written_ += consumed_data.bytes_consumed;
   if (consumed_data.bytes_consumed == write_length) {
     if (fin && consumed_data.fin_consumed) {
@@ -315,7 +317,7 @@ uint32 ReliableQuicStream::ProcessRawData(const char* data, uint32 data_len) {
     total_bytes_consumed += StripPriorityAndHeaderId(data, data_len);
     data += total_bytes_consumed;
     data_len -= total_bytes_consumed;
-    if (data_len == 0 || !session_->connection()->connected()) {
+    if (data_len == 0 || total_bytes_consumed == 0) {
       return total_bytes_consumed;
     }
   }