diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 01:43:25 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 01:43:25 +0000 |
| commit | d38683ad917655da00964ed3c63dc4a6a2530c00 (patch) | |
| tree | caa01db1dae18af4efc8255b602c4180196b4153 /net | |
| parent | b64a96861932eb46acf38e3a2218fc42646ca6e4 (diff) | |
| download | chromium_src-d38683ad917655da00964ed3c63dc4a6a2530c00.zip chromium_src-d38683ad917655da00964ed3c63dc4a6a2530c00.tar.gz chromium_src-d38683ad917655da00964ed3c63dc4a6a2530c00.tar.bz2 | |
Add randomness to proxy bypass timeout on iOS
Fix ifdef around proxy bypass timeout, so it's randomized
on iOS, just like on Android.
BUG=249935
Review URL: https://chromiumcodereview.appspot.com/17108004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_list.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_list.cc b/net/proxy/proxy_list.cc index 723e718..564d3b2 100644 --- a/net/proxy/proxy_list.cc +++ b/net/proxy/proxy_list.cc @@ -195,7 +195,7 @@ bool ProxyList::Fallback(ProxyRetryInfoMap* proxy_retry_info, void ProxyList::UpdateRetryInfoOnFallback( ProxyRetryInfoMap* proxy_retry_info, const BoundNetLog& net_log) const { // Time to wait before retrying a bad proxy server. -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(OS_IOS) // Randomize the timeout over a range from one to five minutes. const TimeDelta proxy_retry_delay = TimeDelta::FromMilliseconds(base::RandInt(1 * 60 * 1000, 5 * 60 * 1000)); |