Index: net/http/http_proxy_client_socket_pool.cc |
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc |
index 6c2084ed980268912b68bc378d07047b67583c59..5720d9d0d5252cd419d4c84ed6c1086b7635a19a 100644 |
--- a/net/http/http_proxy_client_socket_pool.cc |
+++ b/net/http/http_proxy_client_socket_pool.cc |
@@ -68,13 +68,14 @@ HttpProxySocketParams::~HttpProxySocketParams() {} |
// HttpProxyConnectJobs will time out after this many seconds. Note this is on |
// top of the timeout for the transport socket. |
-#if (defined(OS_ANDROID) || defined(OS_IOS)) && defined(SPDY_PROXY_AUTH_ORIGIN) |
+// Proxy connect timeout should be independent of platform and be based on |
mmenke
2014/09/05 16:29:10
nit: This should be prefixed with "TODO(kundaji):
Not at Google. Contact bengr
2014/09/05 21:24:35
Done.
|
+// proxy. Bug 407446. |
+#if (defined(OS_ANDROID) || defined(OS_IOS)) |
mmenke
2014/09/05 16:29:10
nit: outer parentheses not needed.
Not at Google. Contact bengr
2014/09/05 21:24:35
Done.
|
static const int kHttpProxyConnectJobTimeoutInSeconds = 10; |
#else |
static const int kHttpProxyConnectJobTimeoutInSeconds = 30; |
#endif |
- |
HttpProxyConnectJob::HttpProxyConnectJob( |
const std::string& group_name, |
RequestPriority priority, |