diff options
author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 03:51:20 +0000 |
---|---|---|
committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 03:51:20 +0000 |
commit | 1ad77dc23b51198e2b0ce4ba0f8a55635b25474c (patch) | |
tree | 2898a3bfd758ae1f5e3583acdc349dcb88b68ae6 /net/http/http_pipelined_host_impl_unittest.cc | |
parent | 55e31b02ec039da2a348c618f5683ea2af686287 (diff) | |
download | chromium_src-1ad77dc23b51198e2b0ce4ba0f8a55635b25474c.zip chromium_src-1ad77dc23b51198e2b0ce4ba0f8a55635b25474c.tar.gz chromium_src-1ad77dc23b51198e2b0ce4ba0f8a55635b25474c.tar.bz2 |
SPDY - Change all tests to use SPDY/2.1 protocol. Made
changes to SPDY code to support enabling or disabling
flow_control independent of NPN protocol negotiated.
TEST=network unit tests
R=wtc
Review URL: http://codereview.chromium.org/9252029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_pipelined_host_impl_unittest.cc')
-rw-r--r-- | net/http/http_pipelined_host_impl_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_pipelined_host_impl_unittest.cc b/net/http/http_pipelined_host_impl_unittest.cc index c52d573e..48107b5 100644 --- a/net/http/http_pipelined_host_impl_unittest.cc +++ b/net/http/http_pipelined_host_impl_unittest.cc @@ -103,7 +103,7 @@ class HttpPipelinedHostImplTest : public testing::Test { MatchesOrigin(origin_), Ref(ssl_config_), Ref(proxy_info_), Ref(net_log_), true, - SSLClientSocket::kProtoSPDY2)) + SSLClientSocket::kProtoSPDY21)) .Times(1) .WillOnce(Return(pipeline)); EXPECT_CALL(*pipeline, CreateNewStream()) @@ -111,7 +111,7 @@ class HttpPipelinedHostImplTest : public testing::Test { .WillOnce(Return(kDummyStream)); EXPECT_EQ(kDummyStream, host_->CreateStreamOnNewPipeline( kDummyConnection, ssl_config_, proxy_info_, net_log_, true, - SSLClientSocket::kProtoSPDY2)); + SSLClientSocket::kProtoSPDY21)); return pipeline; } @@ -263,7 +263,7 @@ TEST_F(HttpPipelinedHostImplTest, ShutsDownOnOldVersion) { ClearTestPipeline(pipeline); EXPECT_EQ(NULL, host_->CreateStreamOnNewPipeline( kDummyConnection, ssl_config_, proxy_info_, net_log_, true, - SSLClientSocket::kProtoSPDY2)); + SSLClientSocket::kProtoSPDY21)); } TEST_F(HttpPipelinedHostImplTest, ShutsDownOnAuthenticationRequired) { |