diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 00:00:07 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 00:00:07 +0000 |
commit | bb1c4661382511a6853ca6ffaaa31c5113b167fb (patch) | |
tree | 2c40a9dd3a4e1af8c8db871bcd1edc93cd441f12 /net/socket/client_socket_pool_base_unittest.cc | |
parent | eac4be9e2c089e72f338f17a09a9027230adeb26 (diff) | |
download | chromium_src-bb1c4661382511a6853ca6ffaaa31c5113b167fb.zip chromium_src-bb1c4661382511a6853ca6ffaaa31c5113b167fb.tar.gz chromium_src-bb1c4661382511a6853ca6ffaaa31c5113b167fb.tar.bz2 |
[Net] Assert that URLRequests with LOAD_IGNORE_LIMITS have MAXIMUM_PRIORITY
Also remove the priority juggling in ClientSocketPoolBaseHelper, and instead
assert that any requests with ignore_limits = true also has priority =
MAXIMUM_PRIORITY.
BUG=166689
R=asanka@chromium.org, gene@chromium.org, jamesr@chromium.org, joaodasilva@chromium.org, mmenke@chromium.org, simonjam@chromium.org
TBR=benm@chromium.org, jamesr@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232802
Review URL: https://codereview.chromium.org/51683002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base_unittest.cc')
-rw-r--r-- | net/socket/client_socket_pool_base_unittest.cc | 433 |
1 files changed, 165 insertions, 268 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index a35327a..46f4e40 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -45,7 +45,6 @@ namespace { const int kDefaultMaxSockets = 4; const int kDefaultMaxSocketsPerGroup = 2; -const net::RequestPriority kDefaultPriority = MEDIUM; // Make sure |handle| sets load times correctly when it has been assigned a // reused socket. @@ -100,18 +99,16 @@ void TestLoadTimingInfoNotConnected(const ClientSocketHandle& handle) { class TestSocketParams : public base::RefCounted<TestSocketParams> { public: - TestSocketParams() : ignore_limits_(false) {} + explicit TestSocketParams(bool ignore_limits) + : ignore_limits_(ignore_limits) {} - void set_ignore_limits(bool ignore_limits) { - ignore_limits_ = ignore_limits; - } bool ignore_limits() { return ignore_limits_; } private: friend class base::RefCounted<TestSocketParams>; ~TestSocketParams() {} - bool ignore_limits_; + const bool ignore_limits_; }; typedef ClientSocketPoolBase<TestSocketParams> TestClientSocketPoolBase; @@ -665,7 +662,7 @@ class TestConnectJobDelegate : public ConnectJob::Delegate { class ClientSocketPoolBaseTest : public testing::Test { protected: ClientSocketPoolBaseTest() - : params_(new TestSocketParams()), + : params_(new TestSocketParams(false /* ignore_limits */)), histograms_("ClientSocketPoolTest") { connect_backup_jobs_enabled_ = internal::ClientSocketPoolBaseHelper::connect_backup_jobs_enabled(); @@ -750,7 +747,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_NoTimeoutOnSynchronousCompletion) { TestConnectJobDelegate delegate; ClientSocketHandle ignored; TestClientSocketPoolBase::Request request( - &ignored, CompletionCallback(), kDefaultPriority, + &ignored, CompletionCallback(), DEFAULT_PRIORITY, internal::ClientSocketPoolBaseHelper::NORMAL, false, params_, BoundNetLog()); scoped_ptr<TestConnectJob> job( @@ -770,7 +767,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) { CapturingNetLog log; TestClientSocketPoolBase::Request request( - &ignored, CompletionCallback(), kDefaultPriority, + &ignored, CompletionCallback(), DEFAULT_PRIORITY, internal::ClientSocketPoolBaseHelper::NORMAL, false, params_, BoundNetLog()); // Deleted by TestConnectJobDelegate. @@ -817,7 +814,7 @@ TEST_F(ClientSocketPoolBaseTest, BasicSynchronous) { EXPECT_EQ(OK, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), log.bound())); @@ -860,7 +857,7 @@ TEST_F(ClientSocketPoolBaseTest, InitConnectionFailure) { EXPECT_EQ(ERR_CONNECTION_FAILED, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), log.bound())); @@ -887,18 +884,18 @@ TEST_F(ClientSocketPoolBaseTest, TotalLimit) { // TODO(eroman): Check that the NetLog contains this event. - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("c", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("d", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("c", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("d", DEFAULT_PRIORITY)); EXPECT_EQ(static_cast<int>(requests_size()), client_socket_factory_.allocation_count()); EXPECT_EQ(requests_size() - kDefaultMaxSockets, completion_count()); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("e", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("f", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("g", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("e", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("f", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("g", DEFAULT_PRIORITY)); ReleaseAllConnections(ClientSocketPoolTest::NO_KEEP_ALIVE); @@ -924,17 +921,17 @@ TEST_F(ClientSocketPoolBaseTest, TotalLimitReachedNewGroup) { // TODO(eroman): Check that the NetLog contains this event. // Reach all limits: max total sockets, and max sockets per group. - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); EXPECT_EQ(static_cast<int>(requests_size()), client_socket_factory_.allocation_count()); EXPECT_EQ(requests_size() - kDefaultMaxSockets, completion_count()); // Now create a new group and verify that we don't starve it. - EXPECT_EQ(ERR_IO_PENDING, StartRequest("c", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("c", DEFAULT_PRIORITY)); ReleaseAllConnections(ClientSocketPoolTest::NO_KEEP_ALIVE); @@ -1030,13 +1027,13 @@ TEST_F(ClientSocketPoolBaseTest, TotalLimitRespectsGroupLimit) { TEST_F(ClientSocketPoolBaseTest, TotalLimitCountsConnectingSockets) { CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("c", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("c", DEFAULT_PRIORITY)); // Create one asynchronous request. connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("d", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("d", DEFAULT_PRIORITY)); // We post all of our delayed tasks with a 2ms delay. I.e. they don't // actually become pending until 2ms after they have been created. In order @@ -1047,7 +1044,7 @@ TEST_F(ClientSocketPoolBaseTest, TotalLimitCountsConnectingSockets) { // The next synchronous request should wait for its turn. connect_job_factory_->set_job_type(TestConnectJob::kMockJob); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("e", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("e", DEFAULT_PRIORITY)); ReleaseAllConnections(ClientSocketPoolTest::NO_KEEP_ALIVE); @@ -1068,17 +1065,17 @@ TEST_F(ClientSocketPoolBaseTest, CorrectlyCountStalledGroups) { CreatePool(kDefaultMaxSockets, kDefaultMaxSockets); connect_job_factory_->set_job_type(TestConnectJob::kMockJob); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); connect_job_factory_->set_job_type(TestConnectJob::kMockWaitingJob); EXPECT_EQ(kDefaultMaxSockets, client_socket_factory_.allocation_count()); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("b", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("c", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("b", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("c", DEFAULT_PRIORITY)); EXPECT_EQ(kDefaultMaxSockets, client_socket_factory_.allocation_count()); @@ -1100,7 +1097,7 @@ TEST_F(ClientSocketPoolBaseTest, StallAndThenCancelAndTriggerAvailableSocket) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1111,7 +1108,7 @@ TEST_F(ClientSocketPoolBaseTest, StallAndThenCancelAndTriggerAvailableSocket) { EXPECT_EQ(ERR_IO_PENDING, handles[i].Init("b", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1134,7 +1131,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelStalledSocketAtSocketLimit) { for (int i = 0; i < kDefaultMaxSockets; ++i) { EXPECT_EQ(OK, handles[i].Init(base::IntToString(i), params_, - kDefaultPriority, + DEFAULT_PRIORITY, callbacks[i].callback(), pool_.get(), BoundNetLog())); @@ -1145,7 +1142,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelStalledSocketAtSocketLimit) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, stalled_handle.Init("foo", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1173,7 +1170,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelPendingSocketAtSocketLimit) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handles[i].Init(base::IntToString(i), params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1185,7 +1182,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelPendingSocketAtSocketLimit) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, stalled_handle.Init("foo", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1230,7 +1227,7 @@ TEST_F(ClientSocketPoolBaseTest, WaitForStalledSocketAtSocketLimit) { EXPECT_EQ(OK, handles[i].Init(base::StringPrintf( "Take 2: %d", i), params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1243,7 +1240,7 @@ TEST_F(ClientSocketPoolBaseTest, WaitForStalledSocketAtSocketLimit) { // Now we will hit the socket limit. EXPECT_EQ(ERR_IO_PENDING, stalled_handle.Init("foo", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1271,7 +1268,7 @@ TEST_F(ClientSocketPoolBaseTest, CloseIdleSocketAtSocketLimitDeleteGroup) { TestCompletionCallback callback; EXPECT_EQ(OK, handle.Init(base::IntToString(i), params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1291,7 +1288,7 @@ TEST_F(ClientSocketPoolBaseTest, CloseIdleSocketAtSocketLimitDeleteGroup) { // close an idle socket though, since we should reuse the idle socket. EXPECT_EQ(OK, handle.Init("0", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1303,8 +1300,8 @@ TEST_F(ClientSocketPoolBaseTest, CloseIdleSocketAtSocketLimitDeleteGroup) { TEST_F(ClientSocketPoolBaseTest, PendingRequests) { CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", IDLE)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", LOWEST)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", MEDIUM)); @@ -1335,8 +1332,8 @@ TEST_F(ClientSocketPoolBaseTest, PendingRequests) { TEST_F(ClientSocketPoolBaseTest, PendingRequests_NoKeepAlive) { CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", LOWEST)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", MEDIUM)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", HIGHEST)); @@ -1365,7 +1362,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelRequestClearGroup) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1381,7 +1378,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectCancelConnect) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1392,7 +1389,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectCancelConnect) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -1406,8 +1403,8 @@ TEST_F(ClientSocketPoolBaseTest, ConnectCancelConnect) { TEST_F(ClientSocketPoolBaseTest, CancelRequest) { CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", LOWEST)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", MEDIUM)); EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", HIGHEST)); @@ -1480,10 +1477,11 @@ class RequestSocketCallback : public TestCompletionCallbackBase { } within_callback_ = true; TestCompletionCallback next_job_callback; - scoped_refptr<TestSocketParams> params(new TestSocketParams()); + scoped_refptr<TestSocketParams> params( + new TestSocketParams(false /* ignore_limits */)); int rv = handle_->Init("a", params, - kDefaultPriority, + DEFAULT_PRIORITY, next_job_callback.callback(), pool_, BoundNetLog()); @@ -1532,7 +1530,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestPendingJobTwice) { TestConnectJob::kMockPendingJob); int rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -1550,7 +1548,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestPendingJobThenSynchronous) { &handle, pool_.get(), connect_job_factory_, TestConnectJob::kMockJob); int rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -1566,13 +1564,13 @@ TEST_F(ClientSocketPoolBaseTest, CancelActiveRequestWithPendingRequests) { connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); // Now, kDefaultMaxSocketsPerGroup requests should be active. // Let's cancel them. @@ -1603,7 +1601,7 @@ TEST_F(ClientSocketPoolBaseTest, FailingActiveRequestWithPendingRequests) { // Queue up all the requests for (size_t i = 0; i < kNumberOfRequests; ++i) - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); for (size_t i = 0; i < kNumberOfRequests; ++i) EXPECT_EQ(ERR_CONNECTION_FAILED, request(i)->WaitForResult()); @@ -1618,7 +1616,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelActiveRequestThenRequestSocket) { TestCompletionCallback callback; int rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -1629,7 +1627,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelActiveRequestThenRequestSocket) { rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -1649,14 +1647,14 @@ TEST_F(ClientSocketPoolBaseTest, GroupWithPendingRequestsIsNotEmpty) { const RequestPriority kHighPriority = HIGHEST; - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); // This is going to be a pending request in an otherwise empty group. - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); // Reach the maximum socket limit. - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); // Create a stalled group with high priorities. EXPECT_EQ(ERR_IO_PENDING, StartRequest("c", kHighPriority)); @@ -1734,7 +1732,7 @@ TEST_F(ClientSocketPoolBaseTest, handle.set_ssl_error_response_info(info); EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), log.bound())); @@ -1770,7 +1768,7 @@ TEST_F(ClientSocketPoolBaseTest, TwoRequestsCancelOne) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -1778,7 +1776,7 @@ TEST_F(ClientSocketPoolBaseTest, TwoRequestsCancelOne) { EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -1830,7 +1828,7 @@ TEST_F(ClientSocketPoolBaseTest, ReleaseSockets) { TestSocketRequest req1(&request_order, &completion_count); int rv = req1.handle()->Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, req1.callback(), pool_.get(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -1843,7 +1841,7 @@ TEST_F(ClientSocketPoolBaseTest, ReleaseSockets) { TestSocketRequest req2(&request_order, &completion_count); rv = req2.handle()->Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, req2.callback(), pool_.get(), BoundNetLog()); @@ -1851,7 +1849,7 @@ TEST_F(ClientSocketPoolBaseTest, ReleaseSockets) { TestSocketRequest req3(&request_order, &completion_count); rv = req3.handle()->Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, req3.callback(), pool_.get(), BoundNetLog()); @@ -1890,7 +1888,7 @@ TEST_F(ClientSocketPoolBaseTest, PendingJobCompletionOrder) { TestSocketRequest req1(&request_order, &completion_count); int rv = req1.handle()->Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, req1.callback(), pool_.get(), BoundNetLog()); @@ -1899,7 +1897,7 @@ TEST_F(ClientSocketPoolBaseTest, PendingJobCompletionOrder) { TestSocketRequest req2(&request_order, &completion_count); rv = req2.handle()->Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, req2.callback(), pool_.get(), BoundNetLog()); @@ -1911,7 +1909,7 @@ TEST_F(ClientSocketPoolBaseTest, PendingJobCompletionOrder) { TestSocketRequest req3(&request_order, &completion_count); rv = req3.handle()->Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, req3.callback(), pool_.get(), BoundNetLog()); @@ -1936,7 +1934,7 @@ TEST_F(ClientSocketPoolBaseTest, LoadStateOneRequest) { TestCompletionCallback callback; int rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -1959,7 +1957,7 @@ TEST_F(ClientSocketPoolBaseTest, LoadStateTwoRequests) { TestCompletionCallback callback; int rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -1969,7 +1967,7 @@ TEST_F(ClientSocketPoolBaseTest, LoadStateTwoRequests) { TestCompletionCallback callback2; rv = handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog()); @@ -2052,7 +2050,7 @@ TEST_F(ClientSocketPoolBaseTest, LoadStatePoolLimit) { TestCompletionCallback callback; int rv = handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog()); @@ -2063,7 +2061,7 @@ TEST_F(ClientSocketPoolBaseTest, LoadStatePoolLimit) { TestCompletionCallback callback2; rv = handle2.Init("b", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog()); @@ -2075,7 +2073,7 @@ TEST_F(ClientSocketPoolBaseTest, LoadStatePoolLimit) { TestCompletionCallback callback3; rv = handle3.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog()); @@ -2109,7 +2107,7 @@ TEST_F(ClientSocketPoolBaseTest, Recoverable) { ClientSocketHandle handle; TestCompletionCallback callback; EXPECT_EQ(ERR_PROXY_AUTH_REQUESTED, - handle.Init("a", params_, kDefaultPriority, callback.callback(), + handle.Init("a", params_, DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); EXPECT_TRUE(handle.is_initialized()); EXPECT_TRUE(handle.socket()); @@ -2125,7 +2123,7 @@ TEST_F(ClientSocketPoolBaseTest, AsyncRecoverable) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2145,7 +2143,7 @@ TEST_F(ClientSocketPoolBaseTest, AdditionalErrorStateSynchronous) { EXPECT_EQ(ERR_CONNECTION_FAILED, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2165,7 +2163,7 @@ TEST_F(ClientSocketPoolBaseTest, AdditionalErrorStateAsynchronous) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2533,10 +2531,10 @@ TEST_F(ClientSocketPoolBaseTest, connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", DEFAULT_PRIORITY)); EXPECT_EQ(OK, (*requests())[0]->WaitForResult()); EXPECT_EQ(OK, (*requests())[1]->WaitForResult()); @@ -2583,9 +2581,10 @@ class TestReleasingSocketRequest : public TestCompletionCallbackBase { if (reset_releasing_handle_) handle_.Reset(); - scoped_refptr<TestSocketParams> con_params(new TestSocketParams()); + scoped_refptr<TestSocketParams> con_params( + new TestSocketParams(false /* ignore_limits */)); EXPECT_EQ(expected_result_, - handle2_.Init("a", con_params, kDefaultPriority, + handle2_.Init("a", con_params, DEFAULT_PRIORITY, callback2_.callback(), pool_, BoundNetLog())); } @@ -2602,9 +2601,9 @@ class TestReleasingSocketRequest : public TestCompletionCallbackBase { TEST_F(ClientSocketPoolBaseTest, AdditionalErrorSocketsDontUseSlot) { CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup); - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("a", kDefaultPriority)); - EXPECT_EQ(OK, StartRequest("b", kDefaultPriority)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("a", DEFAULT_PRIORITY)); + EXPECT_EQ(OK, StartRequest("b", DEFAULT_PRIORITY)); EXPECT_EQ(static_cast<int>(requests_size()), client_socket_factory_.allocation_count()); @@ -2613,7 +2612,7 @@ TEST_F(ClientSocketPoolBaseTest, AdditionalErrorSocketsDontUseSlot) { TestConnectJob::kMockPendingAdditionalErrorStateJob); TestReleasingSocketRequest req(pool_.get(), OK, false); EXPECT_EQ(ERR_IO_PENDING, - req.handle()->Init("a", params_, kDefaultPriority, req.callback(), + req.handle()->Init("a", params_, DEFAULT_PRIORITY, req.callback(), pool_.get(), BoundNetLog())); // The next job should complete synchronously connect_job_factory_->set_job_type(TestConnectJob::kMockJob); @@ -2641,7 +2640,7 @@ TEST_F(ClientSocketPoolBaseTest, CallbackThatReleasesPool) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2660,7 +2659,7 @@ TEST_F(ClientSocketPoolBaseTest, DoNotReuseSocketAfterFlush) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2674,7 +2673,7 @@ TEST_F(ClientSocketPoolBaseTest, DoNotReuseSocketAfterFlush) { EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2709,7 +2708,7 @@ class ConnectWithinCallback : public TestCompletionCallbackBase { EXPECT_EQ(ERR_IO_PENDING, handle_.Init(group_name_, params_, - kDefaultPriority, + DEFAULT_PRIORITY, nested_callback_.callback(), pool_, BoundNetLog())); @@ -2735,7 +2734,7 @@ TEST_F(ClientSocketPoolBaseTest, AbortAllRequestsOnFlush) { ConnectWithinCallback callback("a", params_, pool_.get()); EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2762,7 +2761,7 @@ TEST_F(ClientSocketPoolBaseTest, BackupSocketCancelAtMaxSockets) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("bar", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2774,7 +2773,7 @@ TEST_F(ClientSocketPoolBaseTest, BackupSocketCancelAtMaxSockets) { TestCompletionCallback callback; EXPECT_EQ(OK, handles[i].Init("bar", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2804,7 +2803,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelBackupSocketAfterCancelingAllRequests) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("bar", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2834,7 +2833,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelBackupSocketAfterFinishingAllRequests) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("bar", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2843,7 +2842,7 @@ TEST_F(ClientSocketPoolBaseTest, CancelBackupSocketAfterFinishingAllRequests) { TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle2.Init("bar", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -2873,7 +2872,7 @@ TEST_F(ClientSocketPoolBaseTest, DelayedSocketBindingWaitingForConnect) { EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2889,7 +2888,7 @@ TEST_F(ClientSocketPoolBaseTest, DelayedSocketBindingWaitingForConnect) { EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2931,7 +2930,7 @@ TEST_F(ClientSocketPoolBaseTest, DelayedSocketBindingAtGroupCapacity) { EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2947,7 +2946,7 @@ TEST_F(ClientSocketPoolBaseTest, DelayedSocketBindingAtGroupCapacity) { EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -2991,7 +2990,7 @@ TEST_F(ClientSocketPoolBaseTest, DelayedSocketBindingAtStall) { EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -3007,7 +3006,7 @@ TEST_F(ClientSocketPoolBaseTest, DelayedSocketBindingAtStall) { EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -3054,7 +3053,7 @@ TEST_F(ClientSocketPoolBaseTest, SynchronouslyProcessOnePendingRequest) { EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3070,7 +3069,7 @@ TEST_F(ClientSocketPoolBaseTest, SynchronouslyProcessOnePendingRequest) { EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3091,7 +3090,7 @@ TEST_F(ClientSocketPoolBaseTest, PreferUsedSocketToUnusedSocket) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3100,7 +3099,7 @@ TEST_F(ClientSocketPoolBaseTest, PreferUsedSocketToUnusedSocket) { TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3108,7 +3107,7 @@ TEST_F(ClientSocketPoolBaseTest, PreferUsedSocketToUnusedSocket) { TestCompletionCallback callback3; EXPECT_EQ(ERR_IO_PENDING, handle3.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback3.callback(), pool_.get(), BoundNetLog())); @@ -3127,19 +3126,19 @@ TEST_F(ClientSocketPoolBaseTest, PreferUsedSocketToUnusedSocket) { EXPECT_EQ(OK, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); EXPECT_EQ(OK, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); EXPECT_EQ(OK, handle3.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback3.callback(), pool_.get(), BoundNetLog())); @@ -3164,7 +3163,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSockets) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3173,7 +3172,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSockets) { TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3200,7 +3199,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsWhenAlreadyHaveAConnectJob) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3220,7 +3219,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsWhenAlreadyHaveAConnectJob) { TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3248,7 +3247,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3257,7 +3256,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3266,7 +3265,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback3; EXPECT_EQ(ERR_IO_PENDING, handle3.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback3.callback(), pool_.get(), BoundNetLog())); @@ -3348,7 +3347,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsCountIdleSockets) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3375,7 +3374,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsCountActiveSockets) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3452,7 +3451,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsMultipleTimesDoesNothing) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3462,7 +3461,7 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsMultipleTimesDoesNothing) { TestCompletionCallback callback2; int rv = handle2.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog()); @@ -3531,7 +3530,7 @@ TEST_F(ClientSocketPoolBaseTest, PreconnectJobsTakenByNormalRequests) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3566,7 +3565,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectedPreconnectJobsHaveNoConnectTimes) { TestCompletionCallback callback; EXPECT_EQ(OK, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -3594,7 +3593,7 @@ TEST_F(ClientSocketPoolBaseTest, PreconnectClosesIdleSocketRemovesGroup) { TestCompletionCallback callback1; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3608,13 +3607,13 @@ TEST_F(ClientSocketPoolBaseTest, PreconnectClosesIdleSocketRemovesGroup) { TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle1.Init("b", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); EXPECT_EQ(ERR_IO_PENDING, handle2.Init("b", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3702,7 +3701,7 @@ TEST_F(ClientSocketPoolBaseTest, PreconnectWithBackupJob) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -3726,7 +3725,6 @@ class MockLayeredPool : public HigherLayeredPool { MockLayeredPool(TestClientSocketPool* pool, const std::string& group_name) : pool_(pool), - params_(new TestSocketParams), group_name_(group_name), can_release_connection_(true) { pool_->AddHigherLayeredPool(this); @@ -3737,13 +3735,16 @@ class MockLayeredPool : public HigherLayeredPool { } int RequestSocket(TestClientSocketPool* pool) { - return handle_.Init(group_name_, params_, kDefaultPriority, + scoped_refptr<TestSocketParams> params( + new TestSocketParams(false /* ignore_limits */)); + return handle_.Init(group_name_, params, DEFAULT_PRIORITY, callback_.callback(), pool, BoundNetLog()); } int RequestSocketWithoutLimits(TestClientSocketPool* pool) { - params_->set_ignore_limits(true); - return handle_.Init(group_name_, params_, kDefaultPriority, + scoped_refptr<TestSocketParams> params( + new TestSocketParams(true /* ignore_limits */)); + return handle_.Init(group_name_, params, MAXIMUM_PRIORITY, callback_.callback(), pool, BoundNetLog()); } @@ -3764,7 +3765,6 @@ class MockLayeredPool : public HigherLayeredPool { private: TestClientSocketPool* const pool_; - scoped_refptr<TestSocketParams> params_; ClientSocketHandle handle_; TestCompletionCallback callback_; const std::string group_name_; @@ -3809,7 +3809,7 @@ TEST_F(ClientSocketPoolBaseTest, CloseIdleSocketsHeldByLayeredPoolWhenNeeded) { TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -3832,7 +3832,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback1; EXPECT_EQ(OK, handle1.Init("group1", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3846,7 +3846,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback2; EXPECT_EQ(ERR_IO_PENDING, handle.Init("group2", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback2.callback(), pool_.get(), BoundNetLog())); @@ -3869,7 +3869,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback1; EXPECT_EQ(OK, handle1.Init("group1", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3886,7 +3886,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback3; EXPECT_EQ(ERR_IO_PENDING, handle3.Init("group3", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback3.callback(), pool_.get(), BoundNetLog())); @@ -3902,7 +3902,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback4; EXPECT_EQ(ERR_IO_PENDING, handle4.Init("group3", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback4.callback(), pool_.get(), BoundNetLog())); @@ -3934,7 +3934,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback1; EXPECT_EQ(OK, handle1.Init("group1", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback1.callback(), pool_.get(), BoundNetLog())); @@ -3997,7 +3997,7 @@ TEST_F(ClientSocketPoolBaseTest, TestCompletionCallback callback; EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", params_, - kDefaultPriority, + DEFAULT_PRIORITY, callback.callback(), pool_.get(), BoundNetLog())); @@ -4009,21 +4009,21 @@ TEST_F(ClientSocketPoolBaseTest, // instead of a request with the same priority that was issued earlier, but // that does not have |ignore_limits| set. TEST_F(ClientSocketPoolBaseTest, IgnoreLimits) { - scoped_refptr<TestSocketParams> params_ignore_limits(new TestSocketParams()); - params_ignore_limits->set_ignore_limits(true); + scoped_refptr<TestSocketParams> params_ignore_limits( + new TestSocketParams(true /* ignore_limits */)); CreatePool(1, 1); // Issue a request to reach the socket pool limit. - EXPECT_EQ(OK, StartRequestWithParams("a", kDefaultPriority, params_)); + EXPECT_EQ(OK, StartRequestWithParams("a", MAXIMUM_PRIORITY, params_)); EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", kDefaultPriority, + EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", MAXIMUM_PRIORITY, params_)); EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", kDefaultPriority, + EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", MAXIMUM_PRIORITY, params_ignore_limits)); ASSERT_EQ(1, pool_->NumConnectJobsInGroup("a")); @@ -4031,76 +4031,25 @@ TEST_F(ClientSocketPoolBaseTest, IgnoreLimits) { EXPECT_FALSE(request(1)->have_result()); } -// Test that when a socket pool and group are at their limits, a request with -// |ignore_limits| set triggers creation of a new socket, and gets the socket -// instead of a request with a higher priority that was issued earlier, but -// that does not have |ignore_limits| set. -TEST_F(ClientSocketPoolBaseTest, IgnoreLimitsLowPriority) { - scoped_refptr<TestSocketParams> params_ignore_limits(new TestSocketParams()); - params_ignore_limits->set_ignore_limits(true); - CreatePool(1, 1); - - // Issue a request to reach the socket pool limit. - EXPECT_EQ(OK, StartRequestWithParams("a", HIGHEST, params_)); - EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); - - connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", HIGHEST, params_)); - EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); - - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", LOW, - params_ignore_limits)); - ASSERT_EQ(1, pool_->NumConnectJobsInGroup("a")); - - EXPECT_EQ(OK, request(2)->WaitForResult()); - EXPECT_FALSE(request(1)->have_result()); -} - -// Test that when a socket pool and group are at their limits, a request with -// |ignore_limits| set triggers creation of a new socket, and gets the socket -// instead of a request with a higher priority that was issued later and -// does not have |ignore_limits| set. -TEST_F(ClientSocketPoolBaseTest, IgnoreLimitsLowPriority2) { - scoped_refptr<TestSocketParams> params_ignore_limits(new TestSocketParams()); - params_ignore_limits->set_ignore_limits(true); - CreatePool(1, 1); - - // Issue a request to reach the socket pool limit. - EXPECT_EQ(OK, StartRequestWithParams("a", HIGHEST, params_)); - EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); - - connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", LOW, - params_ignore_limits)); - ASSERT_EQ(1, pool_->NumConnectJobsInGroup("a")); - - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", HIGHEST, params_)); - EXPECT_EQ(1, pool_->NumConnectJobsInGroup("a")); - - EXPECT_EQ(OK, request(1)->WaitForResult()); - EXPECT_FALSE(request(2)->have_result()); -} - // Test that when a socket pool and group are at their limits, a ConnectJob // issued for a request with |ignore_limits| set is not cancelled when a request // without |ignore_limits| issued to the same group is cancelled. TEST_F(ClientSocketPoolBaseTest, IgnoreLimitsCancelOtherJob) { - scoped_refptr<TestSocketParams> params_ignore_limits(new TestSocketParams()); - params_ignore_limits->set_ignore_limits(true); + scoped_refptr<TestSocketParams> params_ignore_limits( + new TestSocketParams(true /* ignore_limits */)); CreatePool(1, 1); // Issue a request to reach the socket pool limit. - EXPECT_EQ(OK, StartRequestWithParams("a", HIGHEST, params_)); + EXPECT_EQ(OK, StartRequestWithParams("a", MAXIMUM_PRIORITY, params_)); EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", HIGHEST, params_)); + EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", MAXIMUM_PRIORITY, + params_)); EXPECT_EQ(0, pool_->NumConnectJobsInGroup("a")); - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", HIGHEST, + EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", MAXIMUM_PRIORITY, params_ignore_limits)); ASSERT_EQ(1, pool_->NumConnectJobsInGroup("a")); @@ -4113,58 +4062,6 @@ TEST_F(ClientSocketPoolBaseTest, IgnoreLimitsCancelOtherJob) { EXPECT_FALSE(request(1)->have_result()); } -// More involved test of ignore limits. Issues a bunch of requests and later -// checks the order in which they receive sockets. -TEST_F(ClientSocketPoolBaseTest, IgnoreLimitsOrder) { - scoped_refptr<TestSocketParams> params_ignore_limits(new TestSocketParams()); - params_ignore_limits->set_ignore_limits(true); - CreatePool(1, 1); - - connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); - - // Requests 0 and 1 do not have ignore_limits set, so they finish last. Since - // the maximum number of sockets per pool is 1, the second requests does not - // trigger a ConnectJob. - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", HIGHEST, params_)); - EXPECT_EQ(ERR_IO_PENDING, StartRequestWithParams("a", HIGHEST, params_)); - - // Requests 2 and 3 have ignore_limits set, but have a low priority, so they - // finish just before the first two. - EXPECT_EQ(ERR_IO_PENDING, - StartRequestWithParams("a", LOW, params_ignore_limits)); - EXPECT_EQ(ERR_IO_PENDING, - StartRequestWithParams("a", LOW, params_ignore_limits)); - - // Request 4 finishes first, since it is high priority and ignores limits. - EXPECT_EQ(ERR_IO_PENDING, - StartRequestWithParams("a", HIGHEST, params_ignore_limits)); - - // Request 5 and 6 are cancelled right after starting. This should result in - // creating two ConnectJobs. Since only one request (Request 1) did not - // result in creating a ConnectJob, only one of the ConnectJobs should be - // cancelled when the requests are. - EXPECT_EQ(ERR_IO_PENDING, - StartRequestWithParams("a", HIGHEST, params_ignore_limits)); - EXPECT_EQ(ERR_IO_PENDING, - StartRequestWithParams("a", HIGHEST, params_ignore_limits)); - EXPECT_EQ(6, pool_->NumConnectJobsInGroup("a")); - request(5)->handle()->Reset(); - EXPECT_EQ(6, pool_->NumConnectJobsInGroup("a")); - request(6)->handle()->Reset(); - ASSERT_EQ(5, pool_->NumConnectJobsInGroup("a")); - - // Wait for the last request to get a socket. - EXPECT_EQ(OK, request(1)->WaitForResult()); - - // Check order in which requests received sockets. - // These are 1-based indices, while request(x) uses 0-based indices. - EXPECT_EQ(1, GetOrderOfRequest(5)); - EXPECT_EQ(2, GetOrderOfRequest(3)); - EXPECT_EQ(3, GetOrderOfRequest(4)); - EXPECT_EQ(4, GetOrderOfRequest(1)); - EXPECT_EQ(5, GetOrderOfRequest(2)); -} - } // namespace } // namespace net |