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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_session_spdy3_unittest.cc

Issue 15701009: [SPDY] Add a SpdyStreamType enum and use it for SpdyStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« no previous file with comments | « net/spdy/spdy_session_spdy2_unittest.cc ('k') | net/spdy/spdy_stream.h » ('j') | net/spdy/spdy_stream.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_spdy3_unittest.cc
diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc
index de539d350ea89fc28428ee1c40d588c14c7055d7..d1ef36069e55f60c35b4ecba04f97b04240aace7 100644
--- a/net/spdy/spdy_session_spdy3_unittest.cc
+++ b/net/spdy/spdy_session_spdy3_unittest.cc
@@ -248,10 +248,12 @@ TEST_F(SpdySessionSpdy3Test, GoAway) {
GURL url("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, MEDIUM, BoundNetLog());
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, MEDIUM, BoundNetLog());
scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
(*headers)[":method"] = "GET";
@@ -323,7 +325,8 @@ TEST_F(SpdySessionSpdy3Test, ClientPing) {
scoped_refptr<SpdySession> session = CreateInitializedSession();
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
test::StreamDelegateSendImmediate delegate(spdy_stream1, NULL);
spdy_stream1->SetDelegate(&delegate);
@@ -377,7 +380,8 @@ TEST_F(SpdySessionSpdy3Test, ServerPing) {
scoped_refptr<SpdySession> session = CreateInitializedSession();
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
test::StreamDelegateSendImmediate delegate(spdy_stream1, NULL);
spdy_stream1->SetDelegate(&delegate);
@@ -413,10 +417,12 @@ TEST_F(SpdySessionSpdy3Test, DeleteExpiredPushStreams) {
(*request_headers)[":path"] = "/";
scoped_ptr<SpdyStream> stream(
- new SpdyStream(session, std::string(), DEFAULT_PRIORITY,
- kSpdyStreamInitialWindowSize,
- kSpdyStreamInitialWindowSize,
- false, session->net_log_));
+ new SpdyStream(
+ SPDY_REQUEST_RESPONSE_STREAM,
+ session, std::string(), DEFAULT_PRIORITY,
+ kSpdyStreamInitialWindowSize,
+ kSpdyStreamInitialWindowSize,
+ session->net_log_));
stream->SendRequestHeaders(request_headers.Pass(), NO_MORE_DATA_TO_SEND);
SpdyStream* stream_ptr = stream.get();
session->InsertCreatedStream(stream.Pass());
@@ -431,7 +437,7 @@ TEST_F(SpdySessionSpdy3Test, DeleteExpiredPushStreams) {
// Verify that there is one unclaimed push stream.
EXPECT_EQ(1u, session->num_unclaimed_pushed_streams());
- SpdySession::PushedStreamMap::iterator iter =
+ SpdySession::PushedStreamMap::iterator iter =
session->unclaimed_pushed_streams_.find("http://www.google.com/a.dat");
EXPECT_TRUE(session->unclaimed_pushed_streams_.end() != iter);
@@ -478,7 +484,8 @@ TEST_F(SpdySessionSpdy3Test, FailedPing) {
scoped_refptr<SpdySession> session = CreateInitializedSession();
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
test::StreamDelegateSendImmediate delegate(spdy_stream1, NULL);
spdy_stream1->SetDelegate(&delegate);
@@ -537,7 +544,8 @@ TEST_F(SpdySessionSpdy3Test, CloseIdleSessions) {
http_session_.get(), session1.get(), test_host_port_pair1));
GURL url1(kTestHost1);
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session1, url1, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session1, url1, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
// Set up session 2
@@ -553,7 +561,8 @@ TEST_F(SpdySessionSpdy3Test, CloseIdleSessions) {
http_session_.get(), session2.get(), test_host_port_pair2));
GURL url2(kTestHost2);
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session2, url2, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session2, url2, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream2.get() != NULL);
// Set up session 3
@@ -569,7 +578,8 @@ TEST_F(SpdySessionSpdy3Test, CloseIdleSessions) {
http_session_.get(), session3.get(), test_host_port_pair3));
GURL url3(kTestHost3);
base::WeakPtr<SpdyStream> spdy_stream3 =
- CreateStreamSynchronously(session3, url3, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session3, url3, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream3.get() != NULL);
// All sessions are active and not closed
@@ -672,15 +682,17 @@ TEST_F(SpdySessionSpdy3Test, OnSettings) {
// Create 2 streams. First will succeed. Second will be pending.
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
StreamReleaserCallback stream_releaser;
SpdyStreamRequest request;
ASSERT_EQ(ERR_IO_PENDING,
- request.StartRequest(session, test_url_, MEDIUM,
- BoundNetLog(),
- stream_releaser.MakeCallback(&request)));
+ request.StartRequest(
+ SPDY_BIDIRECTIONAL_STREAM, session, test_url_, MEDIUM,
+ BoundNetLog(),
+ stream_releaser.MakeCallback(&request)));
session = NULL;
EXPECT_EQ(OK, stream_releaser.WaitForResult());
@@ -733,16 +745,18 @@ TEST_F(SpdySessionSpdy3Test, ClearSettings) {
// Create 2 streams. First will succeed. Second will be pending.
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
StreamReleaserCallback stream_releaser;
SpdyStreamRequest request;
ASSERT_EQ(ERR_IO_PENDING,
- request.StartRequest(session, test_url_, MEDIUM,
- BoundNetLog(),
- stream_releaser.MakeCallback(&request)));
+ request.StartRequest(
+ SPDY_BIDIRECTIONAL_STREAM, session, test_url_, MEDIUM,
+ BoundNetLog(),
+ stream_releaser.MakeCallback(&request)));
EXPECT_EQ(OK, stream_releaser.WaitForResult());
@@ -787,7 +801,8 @@ TEST_F(SpdySessionSpdy3Test, CancelPendingCreateStream) {
// Create 2 streams. First will succeed. Second will be pending.
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
// Use scoped_ptr to let us invalidate the memory when we want to, to trigger
@@ -796,9 +811,10 @@ TEST_F(SpdySessionSpdy3Test, CancelPendingCreateStream) {
SpdyStreamRequest request;
ASSERT_EQ(ERR_IO_PENDING,
- request.StartRequest(session, test_url_, MEDIUM,
- BoundNetLog(),
- callback->callback()));
+ request.StartRequest(
+ SPDY_BIDIRECTIONAL_STREAM, session, test_url_, MEDIUM,
+ BoundNetLog(),
+ callback->callback()));
// Release the first one, this will allow the second to be created.
spdy_stream1->Cancel();
@@ -1077,13 +1093,16 @@ void IPPoolingTest(SpdyPoolCloseSessionsType close_sessions_type) {
case SPDY_POOL_CLOSE_IDLE_SESSIONS:
GURL url(test_hosts[0].url);
base::WeakPtr<SpdyStream> spdy_stream =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, MEDIUM, BoundNetLog());
GURL url1(test_hosts[1].url);
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session1, url1, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session1, url1, MEDIUM, BoundNetLog());
GURL url2(test_hosts[2].url);
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session2, url2, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session2, url2, MEDIUM, BoundNetLog());
// Close streams to make spdy_session and spdy_session1 inactive.
session->CloseCreatedStream(spdy_stream, OK);
@@ -1298,14 +1317,16 @@ TEST_F(SpdySessionSpdy3Test, OutOfOrderSynStreams) {
GURL url("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session, url, HIGHEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, HIGHEST, BoundNetLog());
ASSERT_TRUE(spdy_stream2.get() != NULL);
EXPECT_EQ(0u, spdy_stream2->stream_id());
test::StreamDelegateDoNothing delegate2(spdy_stream2);
@@ -1363,7 +1384,8 @@ TEST_F(SpdySessionSpdy3Test, CancelStream) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, HIGHEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url1, HIGHEST, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
@@ -1371,7 +1393,8 @@ TEST_F(SpdySessionSpdy3Test, CancelStream) {
GURL url2("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session, url2, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url2, LOWEST, BoundNetLog());
ASSERT_TRUE(spdy_stream2.get() != NULL);
EXPECT_EQ(0u, spdy_stream2->stream_id());
test::StreamDelegateDoNothing delegate2(spdy_stream2);
@@ -1432,13 +1455,15 @@ TEST_F(SpdySessionSpdy3Test, CloseSessionWithTwoCreatedStreams) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, HIGHEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url1, HIGHEST, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
GURL url2("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session, url2, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url2, LOWEST, BoundNetLog());
ASSERT_TRUE(spdy_stream2.get() != NULL);
EXPECT_EQ(0u, spdy_stream2->stream_id());
@@ -1676,7 +1701,8 @@ TEST_F(SpdySessionSpdy3Test, CloseTwoStalledCreateStream) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url1, LOWEST, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
@@ -1686,17 +1712,17 @@ TEST_F(SpdySessionSpdy3Test, CloseTwoStalledCreateStream) {
GURL url2("http://www.google.com");
SpdyStreamRequest request2;
ASSERT_EQ(ERR_IO_PENDING,
- request2.StartRequest(session, url2, LOWEST,
- BoundNetLog(),
- callback2.callback()));
+ request2.StartRequest(
+ SPDY_REQUEST_RESPONSE_STREAM,
+ session, url2, LOWEST, BoundNetLog(), callback2.callback()));
TestCompletionCallback callback3;
GURL url3("http://www.google.com");
SpdyStreamRequest request3;
ASSERT_EQ(ERR_IO_PENDING,
- request3.StartRequest(session, url3, LOWEST,
- BoundNetLog(),
- callback3.callback()));
+ request3.StartRequest(
+ SPDY_REQUEST_RESPONSE_STREAM,
+ session, url3, LOWEST, BoundNetLog(), callback3.callback()));
EXPECT_EQ(1u, session->num_active_streams() + session->num_created_streams());
EXPECT_EQ(2u, session->pending_create_stream_queues(LOWEST));
@@ -1777,7 +1803,8 @@ TEST_F(SpdySessionSpdy3Test, CancelTwoStalledCreateStream) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url1, LOWEST, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
@@ -1785,17 +1812,17 @@ TEST_F(SpdySessionSpdy3Test, CancelTwoStalledCreateStream) {
GURL url2("http://www.google.com");
SpdyStreamRequest request2;
ASSERT_EQ(ERR_IO_PENDING,
- request2.StartRequest(session, url2, LOWEST,
- BoundNetLog(),
- callback2.callback()));
+ request2.StartRequest(
+ SPDY_BIDIRECTIONAL_STREAM, session, url2, LOWEST, BoundNetLog(),
+ callback2.callback()));
TestCompletionCallback callback3;
GURL url3("http://www.google.com");
SpdyStreamRequest request3;
ASSERT_EQ(ERR_IO_PENDING,
- request3.StartRequest(session, url3, LOWEST,
- BoundNetLog(),
- callback3.callback()));
+ request3.StartRequest(
+ SPDY_BIDIRECTIONAL_STREAM, session, url3, LOWEST, BoundNetLog(),
+ callback3.callback()));
EXPECT_EQ(1u, session->num_active_streams() + session->num_created_streams());
EXPECT_EQ(2u, session->pending_create_stream_queues(LOWEST));
@@ -1981,7 +2008,8 @@ TEST_F(SpdySessionSpdy3Test, UpdateStreamsSendWindowSize) {
scoped_refptr<SpdySession> session = CreateInitializedSession();
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
TestCompletionCallback callback1;
EXPECT_NE(spdy_stream1->send_window_size(), window_size);
@@ -1996,7 +2024,8 @@ TEST_F(SpdySessionSpdy3Test, UpdateStreamsSendWindowSize) {
EXPECT_EQ(NULL, spdy_stream1.get());
base::WeakPtr<SpdyStream> spdy_stream2 =
- CreateStreamSynchronously(session, test_url_, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, test_url_, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream2.get() != NULL);
EXPECT_EQ(spdy_stream2->send_window_size(), window_size);
spdy_stream2->Cancel();
@@ -2059,7 +2088,8 @@ TEST_F(SpdySessionSpdy3Test, ReadDataWithoutYielding) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url1, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
@@ -2147,7 +2177,8 @@ TEST_F(SpdySessionSpdy3Test, TestYieldingDuringReadData) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url1, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
@@ -2258,7 +2289,8 @@ TEST_F(SpdySessionSpdy3Test, TestYieldingDuringAsyncReadData) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url1, MEDIUM, BoundNetLog());
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
@@ -2331,7 +2363,8 @@ TEST_F(SpdySessionSpdy3Test, GoAwayWhileInDoLoop) {
GURL url1("http://www.google.com");
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session, url1, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url1, MEDIUM, BoundNetLog());
session = NULL;
ASSERT_TRUE(spdy_stream1.get() != NULL);
EXPECT_EQ(0u, spdy_stream1->stream_id());
@@ -2675,7 +2708,8 @@ TEST_F(SpdySessionSpdy3Test, SessionFlowControlNoReceiveLeaks31) {
GURL url(kStreamUrl);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, MEDIUM, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
EXPECT_EQ(0u, stream->stream_id());
@@ -2754,7 +2788,8 @@ TEST_F(SpdySessionSpdy3Test, SessionFlowControlNoSendLeaks31) {
GURL url(kStreamUrl);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, MEDIUM, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
EXPECT_EQ(0u, stream->stream_id());
@@ -2845,7 +2880,8 @@ TEST_F(SpdySessionSpdy3Test, SessionFlowControlEndToEnd31) {
GURL url(kStreamUrl);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session, url, MEDIUM, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
EXPECT_EQ(0u, stream->stream_id());
@@ -2967,7 +3003,8 @@ void SpdySessionSpdy3Test::RunResumeAfterUnstallTest31(
session->flow_control_state());
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
test::StreamDelegateWithBody delegate(stream, kBodyDataStringPiece);
@@ -3114,7 +3151,8 @@ TEST_F(SpdySessionSpdy3Test, ResumeByPriorityAfterSendWindowSizeIncrease31) {
session->flow_control_state());
base::WeakPtr<SpdyStream> stream1 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream1.get() != NULL);
test::StreamDelegateWithBody delegate1(stream1, kBodyDataStringPiece);
@@ -3123,7 +3161,8 @@ TEST_F(SpdySessionSpdy3Test, ResumeByPriorityAfterSendWindowSizeIncrease31) {
EXPECT_FALSE(stream1->HasUrl());
base::WeakPtr<SpdyStream> stream2 =
- CreateStreamSynchronously(session, url, MEDIUM, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, MEDIUM, BoundNetLog());
ASSERT_TRUE(stream2.get() != NULL);
test::StreamDelegateWithBody delegate2(stream2, kBodyDataStringPiece);
@@ -3268,7 +3307,8 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedStreams31) {
session->flow_control_state());
base::WeakPtr<SpdyStream> stream1 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream1.get() != NULL);
test::StreamDelegateWithBody delegate1(stream1, kBodyDataStringPiece);
@@ -3277,7 +3317,8 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedStreams31) {
EXPECT_FALSE(stream1->HasUrl());
base::WeakPtr<SpdyStream> stream2 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream2.get() != NULL);
StreamClosingDelegate delegate2(stream2, kBodyDataStringPiece);
@@ -3286,7 +3327,8 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedStreams31) {
EXPECT_FALSE(stream2->HasUrl());
base::WeakPtr<SpdyStream> stream3 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream3.get() != NULL);
test::StreamDelegateWithBody delegate3(stream3, kBodyDataStringPiece);
@@ -3423,7 +3465,8 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedSession31) {
session->flow_control_state());
base::WeakPtr<SpdyStream> stream1 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream1.get() != NULL);
test::StreamDelegateWithBody delegate1(stream1, kBodyDataStringPiece);
@@ -3432,7 +3475,8 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedSession31) {
EXPECT_FALSE(stream1->HasUrl());
base::WeakPtr<SpdyStream> stream2 =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM,
+ session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream2.get() != NULL);
test::StreamDelegateWithBody delegate2(stream2, kBodyDataStringPiece);
@@ -3650,7 +3694,8 @@ TEST_F(SpdySessionSpdy3Test, CloseOneIdleConnectionFailsWhenSessionInUse) {
TestCompletionCallback callback1;
base::WeakPtr<SpdyStream> spdy_stream1 =
- CreateStreamSynchronously(session1, url1, DEFAULT_PRIORITY,
+ CreateStreamSynchronously(SPDY_BIDIRECTIONAL_STREAM,
+ session1, url1, DEFAULT_PRIORITY,
BoundNetLog());
ASSERT_TRUE(spdy_stream1.get());
« no previous file with comments | « net/spdy/spdy_session_spdy2_unittest.cc ('k') | net/spdy/spdy_stream.h » ('j') | net/spdy/spdy_stream.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698