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

Unified Diff: net/spdy/spdy_stream_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: CHECK -> DCHECK 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
Index: net/spdy/spdy_stream_spdy3_unittest.cc
diff --git a/net/spdy/spdy_stream_spdy3_unittest.cc b/net/spdy/spdy_stream_spdy3_unittest.cc
index 98c77358008b0c613d4456bc7871e1a0cded36b3..99f370b95eb3712eaf12730bc9aa9b27f918a2d6 100644
--- a/net/spdy/spdy_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_stream_spdy3_unittest.cc
@@ -127,7 +127,8 @@ TEST_F(SpdyStreamSpdy3Test, SendDataAfterOpen) {
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(
+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);
@@ -170,12 +171,12 @@ TEST_F(SpdyStreamSpdy3Test, PushedStream) {
BoundNetLog net_log;
// Conjure up a stream.
- SpdyStream stream(spdy_session,
+ SpdyStream stream(SPDY_PUSH_STREAM,
+ spdy_session,
std::string(),
DEFAULT_PRIORITY,
kSpdyStreamInitialWindowSize,
kSpdyStreamInitialWindowSize,
- true,
net_log);
stream.set_stream_id(2);
EXPECT_FALSE(stream.response_received());
@@ -243,7 +244,8 @@ TEST_F(SpdyStreamSpdy3Test, StreamError) {
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, log.bound());
+ CreateStreamSynchronously(
+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, log.bound());
ASSERT_TRUE(stream.get() != NULL);
StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);
@@ -326,7 +328,8 @@ TEST_F(SpdyStreamSpdy3Test, SendLargeDataAfterOpenRequestResponse) {
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(
+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
std::string body_data(3 * kMaxSpdyFrameChunkSize, 'x');
@@ -389,7 +392,8 @@ TEST_F(SpdyStreamSpdy3Test, SendLargeDataAfterOpenBidirectional) {
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(
+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
std::string body_data(3 * kMaxSpdyFrameChunkSize, 'x');
@@ -451,7 +455,8 @@ TEST_F(SpdyStreamSpdy3Test, IncreaseSendWindowSizeOverflow) {
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, log.bound());
+ CreateStreamSynchronously(
+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, log.bound());
ASSERT_TRUE(stream.get() != NULL);
StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);
stream->SetDelegate(&delegate);
@@ -543,7 +548,8 @@ void SpdyStreamSpdy3Test::RunResumeAfterUnstallRequestResponseTest(
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(
+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
StreamDelegateWithBody delegate(stream, kPostBodyStringPiece);
@@ -630,7 +636,8 @@ void SpdyStreamSpdy3Test::RunResumeAfterUnstallBidirectionalTest(
InitializeSpdySession(session, host_port_pair_);
base::WeakPtr<SpdyStream> stream =
- CreateStreamSynchronously(session, url, LOWEST, BoundNetLog());
+ CreateStreamSynchronously(
+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());
ASSERT_TRUE(stream.get() != NULL);
StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);

Powered by Google App Engine
This is Rietveld 408576698