Land Recent QUIC changes.

net/quic/quic_session_test.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/quic_session.h"
 
 #include <set>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
@@ skipping 77 matching lines @@
   bool IsClosedStream(QuicStreamId id) {
     return QuicSession::IsClosedStream(id);
   }
 
   ReliableQuicStream* GetIncomingReliableStream(QuicStreamId stream_id) {
     return QuicSession::GetIncomingReliableStream(stream_id);
   }
 
   // Helper method for gmock
   void MarkTwoWriteBlocked() {
-    this->MarkWriteBlocked(2);
+    this->MarkWriteBlocked(2, 0);
   }
 
   TestCryptoStream crypto_stream_;
 };
 
 class QuicSessionTest : public ::testing::Test {
  protected:
   QuicSessionTest()
       : guid_(1),
         connection_(new MockConnection(guid_, IPEndPoint(), false)),
@@ skipping 124 matching lines @@
       "\0\0\0\4"   // length
       "abcd";      // invalid compressed data
   stream->ProcessRawData(data, arraysize(data));
 }
 
 TEST_F(QuicSessionTest, OnCanWrite) {
   TestStream* stream2 = session_.CreateOutgoingReliableStream();
   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(
       // Reregister, to test the loop limit.
       testing::InvokeWithoutArgs(&session_, &TestSession::MarkTwoWriteBlocked));
   EXPECT_CALL(*stream6, OnCanWrite());
   EXPECT_CALL(*stream4, OnCanWrite());
 
   EXPECT_FALSE(session_.OnCanWrite());
 }
 
 TEST_F(QuicSessionTest, OnCanWriteWithClosedStream) {
   TestStream* stream2 = session_.CreateOutgoingReliableStream();
   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;
   EXPECT_CALL(*stream2, OnCanWrite());
   EXPECT_CALL(*stream4, OnCanWrite());
   EXPECT_TRUE(session_.OnCanWrite());
 }
 
 // Regression test for http://crbug.com/248737
 TEST_F(QuicSessionTest, OutOfOrderHeaders) {
@@ skipping 108 matching lines @@
   EXPECT_EQ(1u, session.GetNumOpenStreams());
 
   connection->CloseConnection(QUIC_CONNECTION_TIMED_OUT, false);
 
   EXPECT_EQ(0u, session.GetNumOpenStreams());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net