Landing Recent QUIC changes until 05:15 PM, Dec 24, 2016 UTC

net/quic/core/quic_spdy_stream.cc

Index: net/quic/core/quic_spdy_stream.cc
diff --git a/net/quic/core/quic_spdy_stream.cc b/net/quic/core/quic_spdy_stream.cc
index 991373850abb3b8d0b0e7ac96fbeed0fe96ccca6..74a45fa22d1494a69cd4fd8f949daed807a301ef 100644
--- a/net/quic/core/quic_spdy_stream.cc
+++ b/net/quic/core/quic_spdy_stream.cc
@@ -335,8 +335,8 @@ QuicConsumedData QuicSpdyStream::WritevDataInner(
     QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener) {
   if (spdy_session_->headers_stream() != nullptr &&
       spdy_session_->force_hol_blocking()) {
-    return spdy_session_->headers_stream()->WritevStreamData(
-        id(), iov, offset, fin, std::move(ack_listener));
+    return spdy_session_->WritevStreamData(id(), iov, offset, fin,
+                                           std::move(ack_listener));
   }
   return QuicStream::WritevDataInner(iov, offset, fin, std::move(ack_listener));
 }