Update from https://crrev.com/314320

net/socket/ssl_client_socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
@@ skipping 83 matching lines @@
 
 bool SSLClientSocket::WasNpnNegotiated() const {
   return was_npn_negotiated_;
 }
 
 NextProto SSLClientSocket::GetNegotiatedProtocol() const {
   return protocol_negotiated_;
 }
 
 bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
-  if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS)
-    return true;
-
-  if (error == ERR_CERT_COMMON_NAME_INVALID &&
-      (load_flags & LOAD_IGNORE_CERT_COMMON_NAME_INVALID))
-    return true;
-
-  if (error == ERR_CERT_DATE_INVALID &&
-      (load_flags & LOAD_IGNORE_CERT_DATE_INVALID))
-    return true;
-
-  if (error == ERR_CERT_AUTHORITY_INVALID &&
-      (load_flags & LOAD_IGNORE_CERT_AUTHORITY_INVALID))
-    return true;
-
-  return false;
+  return error == OK || (load_flags & LOAD_IGNORE_ALL_CERT_ERRORS);
 }
 
 bool SSLClientSocket::set_was_npn_negotiated(bool negotiated) {
   return was_npn_negotiated_ = negotiated;
 }
 
 bool SSLClientSocket::was_spdy_negotiated() const {
   return was_spdy_negotiated_;
 }
 
@@ skipping 168 matching lines @@
     } else {
       sample += 500;
     }
   } else {
     DCHECK_EQ(kExtensionALPN, negotiation_extension_);
   }
   UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolNegotiation", sample);
 }
 
 }  // namespace net