Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(793)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_stream_factory_test.cc

Issue 1744693002: Implement QUIC-based net::BidirectionalStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@basecl
Patch Set: Address comments and fixed tests Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/quic/bidirectional_stream_quic_impl.cc ('K') | « net/quic/quic_stream_factory.cc ('k') | net/quic/test_tools/quic_test_packet_maker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..658846799cb14cb4949780ffacccee1b7f9d1ae7 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -312,7 +312,7 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<TestParams> {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
stream.reset();
@@ -460,7 +460,7 @@ TEST_P(QuicStreamFactoryTest, Create) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Will reset stream 3.
@@ -473,7 +473,7 @@ TEST_P(QuicStreamFactoryTest, Create) {
EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- stream = request2.ReleaseStream(); // Will reset stream 5.
+ stream = request2.CreateStream(); // Will reset stream 5.
stream.reset(); // Will reset stream 7.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
@@ -500,7 +500,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRtt) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -533,7 +533,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) {
QuicSession::HANDSHAKE_CONFIRMED);
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -566,7 +566,7 @@ TEST_P(QuicStreamFactoryTest, NoZeroRttForDifferentHost) {
QuicSession::HANDSHAKE_CONFIRMED);
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -588,7 +588,7 @@ TEST_P(QuicStreamFactoryTest, GoAway) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
QuicChromiumClientSession* session =
@@ -622,7 +622,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) {
EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -630,7 +630,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_EQ(
@@ -664,7 +664,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingIfDisabled) {
EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -672,7 +672,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingIfDisabled) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_NE(
@@ -707,7 +707,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {
EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -715,7 +715,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
factory_->OnSessionGoingAway(
@@ -730,7 +730,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {
EXPECT_EQ(OK, request3.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback3.callback()));
- scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream3 = request3.CreateStream();
EXPECT_TRUE(stream3.get());
EXPECT_TRUE(QuicStreamFactoryPeer::HasActiveSession(factory_.get(), server2));
@@ -762,7 +762,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {
EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -770,7 +770,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_EQ(QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server1),
@@ -805,7 +805,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingIfDisabled) {
EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -813,7 +813,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingIfDisabled) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_NE(QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server1),
@@ -858,7 +858,7 @@ class QuicAlternativeServiceCertificateValidationPooling
EXPECT_EQ(OK, request1.Request(alternative, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET",
net_log_, callback_.callback()));
- scoped_ptr<QuicHttpStream> stream1 = request1.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream1 = request1.CreateStream();
EXPECT_TRUE(stream1.get());
QuicStreamRequest request2(factory_.get());
@@ -871,7 +871,7 @@ class QuicAlternativeServiceCertificateValidationPooling
// SocketDataProvider is set up, the second request succeeding means that
// it pooled to the session opened by the first one.
EXPECT_EQ(OK, rv);
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
} else {
EXPECT_EQ(ERR_ALTERNATIVE_CERT_NOT_VALID_FOR_ORIGIN, rv);
@@ -922,7 +922,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPoolingWithMatchingPins) {
EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -930,7 +930,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPoolingWithMatchingPins) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_EQ(QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server1),
@@ -971,7 +971,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithMatchingPinsIfDisabled) {
EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -979,7 +979,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithMatchingPinsIfDisabled) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_NE(QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server1),
@@ -1025,7 +1025,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithDifferentPins) {
EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
@@ -1033,7 +1033,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithDifferentPins) {
EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_NE(QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server1),
@@ -1064,7 +1064,7 @@ TEST_P(QuicStreamFactoryTest, Goaway) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Mark the session as going away. Ensure that while it is still alive
@@ -1086,7 +1086,7 @@ TEST_P(QuicStreamFactoryTest, Goaway) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_TRUE(
@@ -1140,7 +1140,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
} else {
EXPECT_EQ(OK, rv);
}
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream);
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -1151,7 +1151,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
CompletionCallback()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream);
EXPECT_EQ(ERR_IO_PENDING,
stream->InitializeStream(&request_info, DEFAULT_PRIORITY, net_log_,
@@ -1299,7 +1299,7 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -1319,7 +1319,7 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- stream = request2.ReleaseStream();
+ stream = request2.CreateStream();
stream.reset(); // Will reset stream 3.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
@@ -1355,7 +1355,7 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -1376,7 +1376,7 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- stream = request2.ReleaseStream();
+ stream = request2.CreateStream();
stream.reset(); // Will reset stream 3.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
@@ -1408,7 +1408,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeSoonToDisconnect) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1473,7 +1473,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeSoonToDisconnect) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_TRUE(
@@ -1523,7 +1523,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnected) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1584,7 +1584,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnected) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_TRUE(
@@ -1625,7 +1625,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeSoonToDisconnectNoNetworks) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1679,7 +1679,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedNoNetworks) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1728,7 +1728,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeSoonToDisconnectNoNewNetwork) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1780,7 +1780,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedNoNewNetwork) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1824,7 +1824,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeSoonToDisconnectNoOpenStreams) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Ensure that session is alive and active.
@@ -1862,7 +1862,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedNoOpenStreams) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Ensure that session is alive and active.
@@ -1906,7 +1906,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -1974,7 +1974,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_TRUE(
@@ -2029,7 +2029,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNoNewNetwork) {
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// Cause QUIC stream to be created.
@@ -2088,7 +2088,7 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -2108,7 +2108,7 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- stream = request2.ReleaseStream();
+ stream = request2.CreateStream();
stream.reset(); // Will reset stream 3.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
@@ -2143,7 +2143,7 @@ TEST_P(QuicStreamFactoryTest, OnCertAdded) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -2164,7 +2164,7 @@ TEST_P(QuicStreamFactoryTest, OnCertAdded) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- stream = request2.ReleaseStream();
+ stream = request2.CreateStream();
stream.reset(); // Will reset stream 3.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
@@ -2199,7 +2199,7 @@ TEST_P(QuicStreamFactoryTest, OnCACertChanged) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -2220,7 +2220,7 @@ TEST_P(QuicStreamFactoryTest, OnCACertChanged) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- stream = request2.ReleaseStream();
+ stream = request2.CreateStream();
stream.reset(); // Will reset stream 3.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
@@ -2347,7 +2347,7 @@ TEST_P(QuicStreamFactoryTest, RacingConnections) {
runner_->RunNextTask();
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -2382,7 +2382,7 @@ TEST_P(QuicStreamFactoryTest, EnableNotLoadFromDiskCache) {
// the CancelWaitForDataReady task hasn't been posted.
ASSERT_EQ(0u, runner_->GetPostedTasks().size());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -2543,13 +2543,13 @@ TEST_P(QuicStreamFactoryTest, BadPacketLoss) {
QuicStreamFactoryPeer::HasActiveSession(factory_.get(), server4));
EXPECT_FALSE(HasActiveSession(server4));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
- scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream3 = request3.CreateStream();
EXPECT_TRUE(stream3.get());
- scoped_ptr<QuicHttpStream> stream4 = request4.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream4 = request4.CreateStream();
EXPECT_TRUE(stream4.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -2636,10 +2636,10 @@ TEST_P(QuicStreamFactoryTest, PublicResetPostHandshakeTwoOfTwo) {
QuicChromiumClientSession::QUIC_DISABLED_PUBLIC_RESET_POST_HANDSHAKE,
factory_->QuicDisabledReason(host_port_pair_.port()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
- EXPECT_TRUE(stream.get());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
- EXPECT_TRUE(stream2.get());
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
+ EXPECT_FALSE(stream.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
+ EXPECT_FALSE(stream2.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
EXPECT_TRUE(socket_data2.AllReadDataConsumed());
@@ -2684,7 +2684,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfTwo) {
QuicChromiumClientSession* session =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), host_port_pair_);
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
@@ -2714,7 +2714,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfTwo) {
QuicChromiumClientSession* session2 =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server2);
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_EQ(OK, stream2->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -2839,12 +2839,12 @@ TEST_P(QuicStreamFactoryTest, PublicResetPostHandshakeTwoOfThree) {
QuicChromiumClientSession::QUIC_DISABLED_PUBLIC_RESET_POST_HANDSHAKE,
factory_->QuicDisabledReason(host_port_pair_.port()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
- EXPECT_TRUE(stream.get());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
- EXPECT_TRUE(stream2.get());
- scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
- EXPECT_TRUE(stream3.get());
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
+ EXPECT_FALSE(stream.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
+ EXPECT_FALSE(stream2.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream3 = request3.CreateStream();
+ EXPECT_FALSE(stream3.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -2900,7 +2900,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfThree) {
QuicChromiumClientSession* session =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), host_port_pair_);
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
@@ -2952,7 +2952,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfThree) {
QuicChromiumClientSession* session3 =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server3);
- scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream3 = request3.CreateStream();
EXPECT_TRUE(stream3.get());
EXPECT_EQ(OK, stream3->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -2969,8 +2969,8 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfThree) {
EXPECT_EQ(QuicChromiumClientSession::QUIC_DISABLED_TIMEOUT_WITH_OPEN_STREAMS,
factory_->QuicDisabledReason(host_port_pair_.port()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
- EXPECT_TRUE(stream2.get());
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
+ EXPECT_FALSE(stream2.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
EXPECT_TRUE(socket_data2.AllReadDataConsumed());
@@ -3011,7 +3011,7 @@ TEST_P(QuicStreamFactoryTest, DisableQuicWhenTimeoutsWithOpenStreams) {
QuicChromiumClientSession* session =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), host_port_pair_);
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
@@ -3163,14 +3163,14 @@ TEST_P(QuicStreamFactoryTest, PublicResetPostHandshakeTwoOfFour) {
EXPECT_FALSE(QuicStreamFactoryPeer::IsQuicDisabled(factory_.get(),
host_port_pair_.port()));
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
- EXPECT_TRUE(stream.get());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
- EXPECT_TRUE(stream2.get());
- scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
- EXPECT_TRUE(stream3.get());
- scoped_ptr<QuicHttpStream> stream4 = request4.ReleaseStream();
- EXPECT_TRUE(stream4.get());
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
+ EXPECT_FALSE(stream.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
+ EXPECT_FALSE(stream2.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream3 = request3.CreateStream();
+ EXPECT_FALSE(stream3.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream4 = request4.CreateStream();
+ EXPECT_FALSE(stream4.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -3234,7 +3234,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfFour) {
QuicChromiumClientSession* session =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), host_port_pair_);
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
HttpRequestInfo request_info;
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
@@ -3304,7 +3304,7 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfFour) {
QuicChromiumClientSession* session4 =
QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server4);
- scoped_ptr<QuicHttpStream> stream4 = request4.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream4 = request4.CreateStream();
EXPECT_TRUE(stream4.get());
EXPECT_EQ(OK, stream4->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
@@ -3319,10 +3319,10 @@ TEST_P(QuicStreamFactoryTest, TimeoutsWithOpenStreamsTwoOfFour) {
EXPECT_FALSE(QuicStreamFactoryPeer::IsQuicDisabled(factory_.get(),
host_port_pair_.port()));
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
- EXPECT_TRUE(stream2.get());
- scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream();
- EXPECT_TRUE(stream3.get());
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
+ EXPECT_FALSE(stream2.get()); // Session is already closed.
+ scoped_ptr<QuicHttpStream> stream3 = request3.CreateStream();
+ EXPECT_FALSE(stream3.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
EXPECT_TRUE(socket_data2.AllReadDataConsumed());
@@ -3376,7 +3376,7 @@ TEST_P(QuicStreamFactoryTest, EnableDelayTcpRace) {
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
@@ -3521,8 +3521,8 @@ TEST_P(QuicStreamFactoryTest, YieldAfterPackets) {
// yielded the read.
EXPECT_EQ(1u, observer.executed_count());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
- EXPECT_TRUE(stream.get());
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
+ EXPECT_FALSE(stream.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
}
@@ -3570,8 +3570,8 @@ TEST_P(QuicStreamFactoryTest, YieldAfterDuration) {
// yielded the read.
EXPECT_EQ(1u, observer.executed_count());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
- EXPECT_TRUE(stream.get());
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
+ EXPECT_FALSE(stream.get()); // Session is already closed.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
EXPECT_TRUE(socket_data.AllWriteDataConsumed());
}
@@ -3592,7 +3592,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushSessionAffinity) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_EQ(0, QuicStreamFactoryPeer::GetNumPushStreamsCreated(factory_.get()));
@@ -3642,7 +3642,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
EXPECT_EQ(0, QuicStreamFactoryPeer::GetNumPushStreamsCreated(factory_.get()));
@@ -3671,7 +3671,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {
EXPECT_EQ(index->GetPromised(url), nullptr);
EXPECT_EQ(OK, callback_.WaitForResult());
- scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream();
+ scoped_ptr<QuicHttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
EXPECT_TRUE(socket_data1.AllReadDataConsumed());
« net/quic/bidirectional_stream_quic_impl.cc ('K') | « net/quic/quic_stream_factory.cc ('k') | net/quic/test_tools/quic_test_packet_maker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698