Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / net / quic / quic_http_stream_test.cc

diff --git a/src/net/quic/quic_http_stream_test.cc b/src/net/quic/quic_http_stream_test.cc
index a49d6bb..2695c8f 100644 (file)
--- a/src/net/quic/quic_http_stream_test.cc
+++ b/src/net/quic/quic_http_stream_test.cc
@@ -75,8 +75,8 @@ class TestReceiveAlgorithm : public ReceiveAlgorithmInterface {
     return false;
   }
 
-  MOCK_METHOD4(RecordIncomingPacket,
-               void(QuicByteCount, QuicPacketSequenceNumber, QuicTime, bool));
+  MOCK_METHOD3(RecordIncomingPacket,
+               void(QuicByteCount, QuicPacketSequenceNumber, QuicTime));
 };
 
 // Subclass of QuicHttpStream that closes itself when the first piece of data
@@ -177,7 +177,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
     runner_ = new TestTaskRunner(&clock_);
     send_algorithm_ = new MockSendAlgorithm();
     receive_algorithm_ = new TestReceiveAlgorithm();
-    EXPECT_CALL(*receive_algorithm_, RecordIncomingPacket(_, _, _, _)).
+    EXPECT_CALL(*receive_algorithm_, RecordIncomingPacket(_, _, _)).
         Times(AnyNumber());
     EXPECT_CALL(*send_algorithm_,
                 OnPacketSent(_, _, _, _, _)).WillRepeatedly(Return(true));
@@ -260,7 +260,14 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
   scoped_ptr<QuicEncryptedPacket> ConstructRstStreamPacket(
       QuicPacketSequenceNumber sequence_number) {
     return maker_.MakeRstPacket(
-        sequence_number, !kIncludeVersion, stream_id_, QUIC_STREAM_CANCELLED);
+        sequence_number, true, stream_id_, QUIC_STREAM_NO_ERROR);
+  }
+
+  scoped_ptr<QuicEncryptedPacket> ConstructAckAndRstStreamPacket(
+      QuicPacketSequenceNumber sequence_number) {
+    return maker_.MakeAckAndRstPacket(
+        sequence_number, !kIncludeVersion, stream_id_, QUIC_STREAM_CANCELLED,
+        1, 1, !kIncludeCongestionFeedback);
   }
 
   scoped_ptr<QuicEncryptedPacket> ConstructAckPacket(
@@ -611,7 +618,7 @@ TEST_P(QuicHttpStreamTest, DestroyedEarly) {
   } else {
     AddWrite(ConstructDataPacket(1, kIncludeVersion, kFin, 0, request_data_));
   }
-  AddWrite(ConstructRstStreamPacket(2));
+  AddWrite(ConstructAckAndRstStreamPacket(2));
   use_closing_stream_ = true;
   Initialize();
 
@@ -648,7 +655,7 @@ TEST_P(QuicHttpStreamTest, Priority) {
   } else {
     AddWrite(ConstructDataPacket(1, kIncludeVersion, kFin, 0, request_data_));
   }
-  AddWrite(ConstructRstStreamPacket(2));
+  AddWrite(ConstructAckAndRstStreamPacket(2));
   use_closing_stream_ = true;
   Initialize();
 
@@ -695,6 +702,11 @@ TEST_P(QuicHttpStreamTest, Priority) {
 TEST_P(QuicHttpStreamTest, CheckPriorityWithNoDelegate) {
   SetRequest("GET", "/", MEDIUM);
   use_closing_stream_ = true;
+
+  if (GetParam() > QUIC_VERSION_13) {
+    AddWrite(ConstructRstStreamPacket(1));
+  }
+
   Initialize();
 
   request_.method = "GET";