diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-07 15:59:20 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-07 17:21:23 +0100 |
| commit | e9b1b6473b26a96741cb0826f910cf99fd011fea (patch) | |
| tree | 824333b38989e8e99742d4db3f4b14b7c2ea4644 | |
| parent | 11aad316ddd7f5db407a4fc1bdd26ba6b8ba912d (diff) | |
| download | external_webkit-e9b1b6473b26a96741cb0826f910cf99fd011fea.zip external_webkit-e9b1b6473b26a96741cb0826f910cf99fd011fea.tar.gz external_webkit-e9b1b6473b26a96741cb0826f910cf99fd011fea.tar.bz2 | |
Merge Chromium at r12.0.742.93: Snapstart error code removed
Snapstart error code removed upstream, removing it from our list
as well.
Chromium CL:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/base/net_error_list.h?r1=76644&r2=81288&pathrev=88489
Change-Id: I80966819f04d13d73608dfb2d1510eabe4a64f38
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp b/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp index 59542da..d5270a9 100644 --- a/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp @@ -98,7 +98,6 @@ WebViewClientError ToWebViewClientError(net::Error error) { case ERR_SSL_BAD_RECORD_MAC_ALERT: case ERR_SSL_UNSAFE_NEGOTIATION: case ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: - case ERR_SSL_SNAP_START_NPN_MISPREDICTION: case ERR_SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED: case ERR_SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY: return ERROR_FAILED_SSL_HANDSHAKE; |