diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-27 22:28:07 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-27 22:28:07 +0000 |
| commit | 4fab8f900192bcd04b34dbc355db117bc336ad90 (patch) | |
| tree | df04211b22644f9084609ac12c89f6aba1218829 /net/base | |
| parent | 7da0c2b783a69aa9ee4b0c914a1ccfb2965adcad (diff) | |
| download | chromium_src-4fab8f900192bcd04b34dbc355db117bc336ad90.zip chromium_src-4fab8f900192bcd04b34dbc355db117bc336ad90.tar.gz chromium_src-4fab8f900192bcd04b34dbc355db117bc336ad90.tar.bz2 | |
Reland of http://codereview.chromium.org/10877025/. Accidentally included other code in the CL when manually landing after the CQ got stuck, so had to revert (See http://codereview.chromium.org/10880048/)
Remove no longer used NetNanny and ESET anti-virus error
strings and ESET error code.
TBR=agl@chromium.org, thakis@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10870103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/net_error_list.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h index 63ec73a..ac3e41c 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -199,10 +199,7 @@ NET_ERROR(PROXY_CONNECTION_FAILED, -130) // that a mandatory PAC script could not be fetched, parsed or executed. NET_ERROR(MANDATORY_PROXY_CONFIGURATION_FAILED, -131) -// We detected an ESET product intercepting our HTTPS connections. Since these -// products are False Start intolerant, we return this error so that we can -// give the user a helpful error message rather than have the connection hang. -NET_ERROR(ESET_ANTI_VIRUS_SSL_INTERCEPTION, -132) +// -132 was formerly ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION // We've hit the max socket limit for the socket pool while preconnecting. We // don't bother trying to preconnect more sockets. |