OSDN Git Service

Merge Chromium at r12.0.742.93: Snapstart error code removed
authorKristian Monsen <kristianm@google.com>
Thu, 7 Jul 2011 14:59:20 +0000 (15:59 +0100)
committerKristian Monsen <kristianm@google.com>
Thu, 7 Jul 2011 16:21:23 +0000 (17:21 +0100)
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

Source/WebKit/android/WebCoreSupport/WebViewClientError.cpp

index 59542da..d5270a9 100644 (file)
@@ -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;