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 dd56079d2c44eb0600a564c8b95c69e436a622ed..213a682898b65449b2caaab3f6e80d9d106c1ef9 100644 |
--- a/net/http/http_proxy_client_socket_pool.cc |
+++ b/net/http/http_proxy_client_socket_pool.cc |
@@ -70,13 +70,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) |
+// TODO(kundaji): Proxy connect timeout should be independent of platform and be |
+// based on proxy. Bug http://crbug.com/407446. |
+#if defined(OS_ANDROID) || defined(OS_IOS) |
static const int kHttpProxyConnectJobTimeoutInSeconds = 10; |
#else |
static const int kHttpProxyConnectJobTimeoutInSeconds = 30; |
#endif |
- |
HttpProxyConnectJob::HttpProxyConnectJob( |
const std::string& group_name, |
RequestPriority priority, |
@@ -384,7 +385,9 @@ HttpProxyConnectJobFactory::HttpProxyConnectJobFactory( |
net_log_(net_log) { |
base::TimeDelta max_pool_timeout = base::TimeDelta(); |
-#if (defined(OS_ANDROID) || defined(OS_IOS)) && defined(SPDY_PROXY_AUTH_ORIGIN) |
+// TODO(kundaji): Proxy connect timeout should be independent of platform and be |
+// based on proxy. Bug http://crbug.com/407446. |
+#if (defined(OS_ANDROID) || defined(OS_IOS)) |
#else |
if (transport_pool_) |
max_pool_timeout = transport_pool_->ConnectionTimeout(); |