diff options
author | kristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 13:00:20 +0000 |
---|---|---|
committer | kristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 13:00:20 +0000 |
commit | 5acdce175d32ba915ac5933ae197e4fc59f7ec8f (patch) | |
tree | 453c421316ffeb17ed92295ca4e16c0df9b62123 /net/socket/client_socket_pool_base_unittest.cc | |
parent | 37961b1922d7abcdad8849e4cbab9b7fda8066d0 (diff) | |
download | chromium_src-5acdce175d32ba915ac5933ae197e4fc59f7ec8f.zip chromium_src-5acdce175d32ba915ac5933ae197e4fc59f7ec8f.tar.gz chromium_src-5acdce175d32ba915ac5933ae197e4fc59f7ec8f.tar.bz2 |
Add ignore limits flag and use for sync request
Letting sync request ignore the socket and group limits when
loading to prevent the WebCore thread from locking up.
BUG=45986,58703
TEST=No new tests
Review URL: http://codereview.chromium.org/6756004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79817 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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 50b7f96..d22b6dc 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -35,6 +35,8 @@ const int kDefaultMaxSocketsPerGroup = 2; const net::RequestPriority kDefaultPriority = MEDIUM; class TestSocketParams : public base::RefCounted<TestSocketParams> { + public: + bool ignore_limits() { return false; } private: friend class base::RefCounted<TestSocketParams>; ~TestSocketParams() {} @@ -591,7 +593,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_NoTimeoutOnSynchronousCompletion) { TestClientSocketPoolBase::Request request( &ignored, NULL, kDefaultPriority, internal::ClientSocketPoolBaseHelper::NORMAL, - params_, BoundNetLog()); + false, params_, BoundNetLog()); scoped_ptr<TestConnectJob> job( new TestConnectJob(TestConnectJob::kMockJob, "a", @@ -611,7 +613,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) { TestClientSocketPoolBase::Request request( &ignored, NULL, kDefaultPriority, internal::ClientSocketPoolBaseHelper::NORMAL, - params_, BoundNetLog()); + false, params_, BoundNetLog()); // Deleted by TestConnectJobDelegate. TestConnectJob* job = new TestConnectJob(TestConnectJob::kMockPendingJob, |