summaryrefslogtreecommitdiffstats
path: root/net/socket/socket_test_util.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 19:45:39 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 19:45:39 +0000
commit3f6007ab1f6075c31dc23b5ded198f22a3d08bae (patch)
tree3337276b3407ff0dd3ac9edad909a8a2ffd37cbf /net/socket/socket_test_util.cc
parente98b970ce84ca3bccbf34985de1c663367ec4412 (diff)
downloadchromium_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/socket/socket_test_util.cc')
-rw-r--r--net/socket/socket_test_util.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 159f62e..78e9e7c 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -1732,6 +1732,7 @@ MockTransportClientSocketPool::MockTransportClientSocketPool(
: TransportClientSocketPool(max_sockets, max_sockets_per_group, histograms,
NULL, NULL, NULL),
client_socket_factory_(socket_factory),
+ last_request_priority_(DEFAULT_PRIORITY),
release_count_(0),
cancel_count_(0) {
}
@@ -1742,6 +1743,7 @@ int MockTransportClientSocketPool::RequestSocket(
const std::string& group_name, const void* socket_params,
RequestPriority priority, ClientSocketHandle* handle,
const CompletionCallback& callback, const BoundNetLog& net_log) {
+ last_request_priority_ = priority;
scoped_ptr<StreamSocket> socket =
client_socket_factory_->CreateTransportClientSocket(
AddressList(), net_log.net_log(), net::NetLog::Source());