Merge 17919 - We don't handle certificate errors during SSL renegotiation....

net/base/net_error_list.h

Index: net/base/net_error_list.h
===================================================================
--- net/base/net_error_list.h	(revision 18170)
+++ net/base/net_error_list.h	(working copy)
@@ -99,6 +99,13 @@
 // The proxy requested authentication (for tunnel establishment).
 NET_ERROR(PROXY_AUTH_REQUESTED, -115)
 
+// During SSL renegotiation (rehandshake), the server sent a certificate with
+// an error.
+//
+// Note: this error is not in the -2xx range so that it won't be handled as a
+// certificate error.
+NET_ERROR(CERT_ERROR_IN_SSL_RENEGOTIATION, -116)
+
 // Certificate error codes
 //
 // The values of certificate error codes must be consecutive.
Property changes on: net\base\net_error_list.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/net/base/net_error_list.h:r69-2775
   Merged /trunk/src/net/base/net_error_list.h:r17919