| 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 829a5e78314968bca7b6acce7b9f6fd3c7215482..93a6736bcd60df61f17a45a90043fe61cb576ba3 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
|
| +// proxy. Bug 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,
|
|
|