projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
net
/
socket
/
socks_client_socket_pool_unittest.cc
diff --git
a/src/net/socket/socks_client_socket_pool_unittest.cc
b/src/net/socket/socks_client_socket_pool_unittest.cc
index
b2b8655
..
ec2230c
100644
(file)
--- a/
src/net/socket/socks_client_socket_pool_unittest.cc
+++ b/
src/net/socket/socks_client_socket_pool_unittest.cc
@@
-44,8
+44,8
@@
void TestLoadTimingInfo(const ClientSocketHandle& handle) {
scoped_refptr<TransportSocketParams> CreateProxyHostParams() {
return new TransportSocketParams(
scoped_refptr<TransportSocketParams> CreateProxyHostParams() {
return new TransportSocketParams(
- HostPortPair("proxy", 80), false, false,
-
OnHostResolutionCallback()
);
+ HostPortPair("proxy", 80), false, false,
OnHostResolutionCallback(),
+
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT
);
}
scoped_refptr<SOCKSSocketParams> CreateSOCKSv4Params() {
}
scoped_refptr<SOCKSSocketParams> CreateSOCKSv4Params() {