diff options
Diffstat (limited to 'chromium/net/spdy/spdy_http_stream_unittest.cc')
| -rw-r--r-- | chromium/net/spdy/spdy_http_stream_unittest.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/chromium/net/spdy/spdy_http_stream_unittest.cc b/chromium/net/spdy/spdy_http_stream_unittest.cc index 5a5870365b5..d20d822493a 100644 --- a/chromium/net/spdy/spdy_http_stream_unittest.cc +++ b/chromium/net/spdy/spdy_http_stream_unittest.cc @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop_proxy.h" +#include "base/run_loop.h" #include "base/stl_util.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" @@ -130,8 +131,7 @@ INSTANTIATE_TEST_CASE_P( NextProto, SpdyHttpStreamTest, testing::Values(kProtoDeprecatedSPDY2, - kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2, - kProtoHTTP2Draft04)); + kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); // SpdyHttpStream::GetUploadProgress() should still work even before the // stream is initialized. @@ -142,13 +142,16 @@ TEST_P(SpdyHttpStreamTest, GetUploadProgressBeforeInitialization) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSession(reads, arraysize(reads), NULL, 0, key); SpdyHttpStream stream(session_, false); UploadProgress progress = stream.GetUploadProgress(); EXPECT_EQ(0u, progress.size()); EXPECT_EQ(0u, progress.position()); + + // Pump the event loop so |reads| is consumed before the function returns. + base::RunLoop().RunUntilIdle(); } TEST_P(SpdyHttpStreamTest, SendRequest) { @@ -165,7 +168,7 @@ TEST_P(SpdyHttpStreamTest, SendRequest) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSession(reads, arraysize(reads), writes, arraysize(writes), key); HttpRequestInfo request; @@ -240,7 +243,7 @@ TEST_P(SpdyHttpStreamTest, LoadTimingTwoRequests) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSessionDeterministic(reads, arraysize(reads), writes, arraysize(writes), key); @@ -329,7 +332,7 @@ TEST_P(SpdyHttpStreamTest, SendChunkedPost) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSession(vector_as_array(&reads), reads.size(), vector_as_array(&writes), writes.size(), key); @@ -405,7 +408,7 @@ TEST_P(SpdyHttpStreamTest, DelayedSendChunkedPost) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSessionDeterministic(reads, arraysize(reads), writes, arraysize(writes), key); @@ -499,7 +502,7 @@ TEST_P(SpdyHttpStreamTest, SpdyURLTest) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSession(reads, arraysize(reads), writes, arraysize(writes), key); HttpRequestInfo request; @@ -558,7 +561,7 @@ TEST_P(SpdyHttpStreamTest, DelayedSendChunkedPostWithWindowUpdate) { HostPortPair host_port_pair("www.google.com", 80); SpdySessionKey key(host_port_pair, ProxyServer::Direct(), - kPrivacyModeDisabled); + PRIVACY_MODE_DISABLED); InitSessionDeterministic(reads, arraysize(reads), writes, arraysize(writes), |