diff options
| author | eroman <eroman@chromium.org> | 2015-03-27 12:04:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-27 19:05:33 +0000 |
| commit | 9004cf38091c4e82f47e5cdeeb1f71e676e28855 (patch) | |
| tree | fa69022556f8073424219b42e42c881d033cdc14 | |
| parent | 0fcfd549d6f82dbae4867b816b355aeb6329d8bb (diff) | |
| download | chromium_src-9004cf38091c4e82f47e5cdeeb1f71e676e28855.zip chromium_src-9004cf38091c4e82f47e5cdeeb1f71e676e28855.tar.gz chromium_src-9004cf38091c4e82f47e5cdeeb1f71e676e28855.tar.bz2 | |
Test for net::ERR_ICANN_NAME_COLLISION in other places that check host resolover failures.
BUG=470704
Review URL: https://codereview.chromium.org/1037043002
Cr-Commit-Position: refs/heads/master@{#322619}
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java | 1 | ||||
| -rw-r--r-- | ppapi/host/error_conversion.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java b/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java index a4d3888..a24e10f 100644 --- a/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java +++ b/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java @@ -97,6 +97,7 @@ public abstract class ErrorCodeConversionHelper { case NetError.ERR_ADDRESS_UNREACHABLE: case NetError.ERR_NAME_NOT_RESOLVED: case NetError.ERR_NAME_RESOLUTION_FAILED: + case NetError.ERR_ICANN_NAME_COLLISION: return ERROR_HOST_LOOKUP; case NetError.ERR_SSL_PROTOCOL_ERROR: diff --git a/ppapi/host/error_conversion.cc b/ppapi/host/error_conversion.cc index 2b7d73c..f97b121 100644 --- a/ppapi/host/error_conversion.cc +++ b/ppapi/host/error_conversion.cc @@ -53,6 +53,7 @@ int32_t NetErrorToPepperError(int net_error) { case net::ERR_CONNECTION_FAILED: return PP_ERROR_CONNECTION_FAILED; case net::ERR_NAME_NOT_RESOLVED: + case net::ERR_ICANN_NAME_COLLISION: return PP_ERROR_NAME_NOT_RESOLVED; case net::ERR_ADDRESS_INVALID: return PP_ERROR_ADDRESS_INVALID; |