Cleanup HPKP error handling and weak DH key handling

net/socket/ssl_client_socket_impl.cc

Index: net/socket/ssl_client_socket_impl.cc
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
index 10bda9110ba2ed90d2667458c34c931df66961cc..60a8fae446bc38d88b85149bbbb7bdeb07299eef 100644
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -1335,10 +1335,12 @@ int SSLClientSocketImpl::DoVerifyCertComplete(int result) {
           server_cert_verify_result_.public_key_hashes, server_cert_.get(),
           server_cert_verify_result_.verified_cert.get(),
           TransportSecurityState::ENABLE_PIN_REPORTS, &pinning_failure_log_)) {
-    if (server_cert_verify_result_.is_issued_by_known_root)
+    if (server_cert_verify_result_.is_issued_by_known_root) {
+      server_cert_verify_result_.cert_status |= CERT_STATUS_PINNED_KEY_MISSING;
       result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN;
-    else
+    } else {
       pkp_bypassed_ = true;
+    }
   }
 
   if (result == OK) {