diff options
| author | kristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 19:02:43 +0000 |
|---|---|---|
| committer | kristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 19:02:43 +0000 |
| commit | c933965b0974d3bd8b090b12766520c0878502a0 (patch) | |
| tree | 1e3e91b92859783f7627d23c25133c4984472b1e /net/spdy | |
| parent | d8b2a3f1837afd62a2a085921babcf3421bfdbb6 (diff) | |
| download | chromium_src-c933965b0974d3bd8b090b12766520c0878502a0.zip chromium_src-c933965b0974d3bd8b090b12766520c0878502a0.tar.gz chromium_src-c933965b0974d3bd8b090b12766520c0878502a0.tar.bz2 | |
Revert 78034 - Removing a TODO and cleaning up code.
This is done in preparation of a patch to
let some request ignore the max sockets
and max sockets to group limits.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6679001
TBR=kristianm@google.com
Review URL: http://codereview.chromium.org/6685057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_http_stream_unittest.cc | 3 | ||||
| -rw-r--r-- | net/spdy/spdy_session_unittest.cc | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc index 730c5cc..bee345a 100644 --- a/net/spdy/spdy_http_stream_unittest.cc +++ b/net/spdy/spdy_http_stream_unittest.cc @@ -30,7 +30,8 @@ class SpdyHttpStreamTest : public testing::Test { session_deps_.socket_factory->AddSocketDataProvider(data_.get()); http_session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_); session_ = http_session_->spdy_session_pool()->Get(pair, BoundNetLog()); - tcp_params_ = new TCPSocketParams(host_port_pair, + tcp_params_ = new TCPSocketParams(host_port_pair.host(), + host_port_pair.port(), MEDIUM, GURL(), false); TestCompletionCallback callback; scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index ee59f8b..0f3b601 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc @@ -92,7 +92,7 @@ TEST_F(SpdySessionTest, GoAway) { EXPECT_TRUE(spdy_session_pool->HasSession(pair)); scoped_refptr<TCPSocketParams> tcp_params( - new TCPSocketParams(test_host_port_pair, MEDIUM, GURL(), false)); + new TCPSocketParams(kTestHost, kTestPort, MEDIUM, GURL(), false)); scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); EXPECT_EQ(OK, connection->Init(test_host_port_pair.ToString(), tcp_params, MEDIUM, @@ -199,7 +199,7 @@ TEST_F(SpdySessionTest, OnSettings) { ASSERT_TRUE(spdy_session_pool->HasSession(pair)); scoped_refptr<TCPSocketParams> tcp_params( - new TCPSocketParams(test_host_port_pair, MEDIUM, GURL(), false)); + new TCPSocketParams(kTestHost, kTestPort, MEDIUM, GURL(), false)); scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); EXPECT_EQ(OK, connection->Init(test_host_port_pair.ToString(), tcp_params, MEDIUM, @@ -280,7 +280,7 @@ TEST_F(SpdySessionTest, CancelPendingCreateStream) { ASSERT_TRUE(spdy_session_pool->HasSession(pair)); scoped_refptr<TCPSocketParams> tcp_params( - new TCPSocketParams(test_host_port_pair, MEDIUM, GURL(), false)); + new TCPSocketParams(kTestHost, kTestPort, MEDIUM, GURL(), false)); scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); EXPECT_EQ(OK, connection->Init(test_host_port_pair.ToString(), tcp_params, MEDIUM, @@ -375,7 +375,7 @@ TEST_F(SpdySessionTest, SendSettingsOnNewSession) { EXPECT_TRUE(spdy_session_pool->HasSession(pair)); scoped_refptr<TCPSocketParams> tcp_params( - new TCPSocketParams(test_host_port_pair, MEDIUM, GURL(), false)); + new TCPSocketParams(kTestHost, kTestPort, MEDIUM, GURL(), false)); scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); EXPECT_EQ(OK, connection->Init(test_host_port_pair.ToString(), tcp_params, MEDIUM, |