Land Recent QUIC changes.

net/quic/quic_session_test.cc

Index: net/quic/quic_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index b7953aee110b997adc09cd2015288e445b66194b..9d229a17379ae04b9ed1607a3f36c2571773fa2b 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -95,7 +95,7 @@ class TestSession : public QuicSession {
 
   // Helper method for gmock
   void MarkTwoWriteBlocked() {
-    this->MarkWriteBlocked(2);
+    this->MarkWriteBlocked(2, 0);
   }
 
   TestCryptoStream crypto_stream_;
@@ -240,9 +240,9 @@ TEST_F(QuicSessionTest, OnCanWrite) {
   TestStream* stream4 = session_.CreateOutgoingReliableStream();
   TestStream* stream6 = session_.CreateOutgoingReliableStream();
 
-  session_.MarkWriteBlocked(2);
-  session_.MarkWriteBlocked(6);
-  session_.MarkWriteBlocked(4);
+  session_.MarkWriteBlocked(2, 0);
+  session_.MarkWriteBlocked(6, 0);
+  session_.MarkWriteBlocked(4, 0);
 
   InSequence s;
   EXPECT_CALL(*stream2, OnCanWrite()).WillOnce(
@@ -259,9 +259,9 @@ TEST_F(QuicSessionTest, OnCanWriteWithClosedStream) {
   TestStream* stream4 = session_.CreateOutgoingReliableStream();
   session_.CreateOutgoingReliableStream();  // stream 6
 
-  session_.MarkWriteBlocked(2);
-  session_.MarkWriteBlocked(6);
-  session_.MarkWriteBlocked(4);
+  session_.MarkWriteBlocked(2, 0);
+  session_.MarkWriteBlocked(6, 0);
+  session_.MarkWriteBlocked(4, 0);
   CloseStream(6);
 
   InSequence s;