diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 19:45:39 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 19:45:39 +0000 |
| commit | 3f6007ab1f6075c31dc23b5ded198f22a3d08bae (patch) | |
| tree | 3337276b3407ff0dd3ac9edad909a8a2ffd37cbf /net/spdy | |
| parent | e98b970ce84ca3bccbf34985de1c663367ec4412 (diff) | |
| download | chromium_src-3f6007ab1f6075c31dc23b5ded198f22a3d08bae.zip chromium_src-3f6007ab1f6075c31dc23b5ded198f22a3d08bae.tar.gz chromium_src-3f6007ab1f6075c31dc23b5ded198f22a3d08bae.tar.bz2 | |
Refactor socket pool handling of priorities
Move the priority from the socket param classes to their respective
ConnectJob implementations. This prevents the possibility of
mismatching priorities when socket params have member variables of
other socket param types.
Add tests for priority propagation.
BUG=166689
R=mmenke@chromium.org
Review URL: https://codereview.chromium.org/22818010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_session_unittest.cc | 6 | ||||
| -rw-r--r-- | net/spdy/spdy_test_util_common.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index 575ebf2..116942c 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc @@ -2759,7 +2759,7 @@ TEST_P(SpdySessionTest, CloseOneIdleConnection) { TestCompletionCallback callback2; HostPortPair host_port2("2.com", 80); scoped_refptr<TransportSocketParams> params2( - new TransportSocketParams(host_port2, DEFAULT_PRIORITY, false, false, + new TransportSocketParams(host_port2, false, false, OnHostResolutionCallback())); scoped_ptr<ClientSocketHandle> connection2(new ClientSocketHandle); EXPECT_EQ(ERR_IO_PENDING, @@ -2838,7 +2838,7 @@ TEST_P(SpdySessionTest, CloseOneIdleConnectionWithAlias) { TestCompletionCallback callback3; HostPortPair host_port3("3.com", 80); scoped_refptr<TransportSocketParams> params3( - new TransportSocketParams(host_port3, DEFAULT_PRIORITY, false, false, + new TransportSocketParams(host_port3, false, false, OnHostResolutionCallback())); scoped_ptr<ClientSocketHandle> connection3(new ClientSocketHandle); EXPECT_EQ(ERR_IO_PENDING, @@ -2918,7 +2918,7 @@ TEST_P(SpdySessionTest, CloseOneIdleConnectionFailsWhenSessionInUse) { TestCompletionCallback callback2; HostPortPair host_port2("2.com", 80); scoped_refptr<TransportSocketParams> params2( - new TransportSocketParams(host_port2, DEFAULT_PRIORITY, false, false, + new TransportSocketParams(host_port2, false, false, OnHostResolutionCallback())); scoped_ptr<ClientSocketHandle> connection2(new ClientSocketHandle); EXPECT_EQ(ERR_IO_PENDING, diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc index af3b337..8fb085a 100644 --- a/net/spdy/spdy_test_util_common.cc +++ b/net/spdy/spdy_test_util_common.cc @@ -500,7 +500,7 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper( scoped_refptr<TransportSocketParams> transport_params( new TransportSocketParams( - key.host_port_pair(), MEDIUM, false, false, + key.host_port_pair(), false, false, OnHostResolutionCallback())); scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); |