| Index: net/quic/quic_stream_factory_test.cc
|
| diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
|
| index e5fcf955b2b9f03108d8571b273c41d0d7a9e434..bf4d89f821b9b0ab72a6edc753640b7eacbb0486 100644
|
| --- a/net/quic/quic_stream_factory_test.cc
|
| +++ b/net/quic/quic_stream_factory_test.cc
|
| @@ -2637,9 +2637,9 @@ TEST_P(QuicStreamFactoryTest, PublicResetPostHandshakeTwoOfTwo) {
|
| factory_->QuicDisabledReason(host_port_pair_.port()));
|
|
|
| scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
|
| - EXPECT_TRUE(stream.get());
|
| + EXPECT_FALSE(stream.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
|
| - EXPECT_TRUE(stream2.get());
|
| + EXPECT_FALSE(stream2.get()); // Session is already closed.
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| EXPECT_TRUE(socket_data2.AllReadDataConsumed());
|
| @@ -2840,11 +2840,11 @@ TEST_P(QuicStreamFactoryTest, PublicResetPostHandshakeTwoOfThree) {
|
| factory_->QuicDisabledReason(host_port_pair_.port()));
|
|
|
| scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
|
| - EXPECT_TRUE(stream.get());
|
| + EXPECT_FALSE(stream.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
|
| - EXPECT_TRUE(stream2.get());
|
| + EXPECT_FALSE(stream2.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
|
| - EXPECT_TRUE(stream3.get());
|
| + EXPECT_FALSE(stream3.get()); // Session is already closed.
|
|
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| @@ -2970,7 +2970,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfThree) {
|
| factory_->QuicDisabledReason(host_port_pair_.port()));
|
|
|
| scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
|
| - EXPECT_TRUE(stream2.get());
|
| + EXPECT_FALSE(stream2.get()); // Session is already closed.
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| EXPECT_TRUE(socket_data2.AllReadDataConsumed());
|
| @@ -3164,13 +3164,13 @@ TEST_P(QuicStreamFactoryTest, PublicResetPostHandshakeTwoOfFour) {
|
| host_port_pair_.port()));
|
|
|
| scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
|
| - EXPECT_TRUE(stream.get());
|
| + EXPECT_FALSE(stream.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
|
| - EXPECT_TRUE(stream2.get());
|
| + EXPECT_FALSE(stream2.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
|
| - EXPECT_TRUE(stream3.get());
|
| + EXPECT_FALSE(stream3.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream4 = request4.ReleaseStream();
|
| - EXPECT_TRUE(stream4.get());
|
| + EXPECT_FALSE(stream4.get()); // Session is already closed.
|
|
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| @@ -3320,9 +3320,9 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfFour) {
|
| host_port_pair_.port()));
|
|
|
| scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
|
| - EXPECT_TRUE(stream2.get());
|
| + EXPECT_FALSE(stream2.get()); // Session is already closed.
|
| scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
|
| - EXPECT_TRUE(stream3.get());
|
| + EXPECT_FALSE(stream3.get()); // Session is already closed.
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| EXPECT_TRUE(socket_data2.AllReadDataConsumed());
|
| @@ -3522,7 +3522,7 @@ TEST_P(QuicStreamFactoryTest, YieldAfterPackets) {
|
| EXPECT_EQ(1u, observer.executed_count());
|
|
|
| scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
|
| - EXPECT_TRUE(stream.get());
|
| + EXPECT_FALSE(stream.get()); // Session is already closed.
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| }
|
| @@ -3571,7 +3571,7 @@ TEST_P(QuicStreamFactoryTest, YieldAfterDuration) {
|
| EXPECT_EQ(1u, observer.executed_count());
|
|
|
| scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
|
| - EXPECT_TRUE(stream.get());
|
| + EXPECT_FALSE(stream.get()); // Session is already closed.
|
| EXPECT_TRUE(socket_data.AllReadDataConsumed());
|
| EXPECT_TRUE(socket_data.AllWriteDataConsumed());
|
| }
|
|
|