Revert 113419 - Revert 113409 - Add a new method to SSLClientSocket:

net/socket/ssl_client_socket_nss.cc

 // Copyright (c) 2011 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.
 
 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
 // from AuthCertificateCallback() in
 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ skipping 1699 matching lines @@
                                                            PR_FALSE);
   net_log_.AddEvent(NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
       make_scoped_refptr(new NetLogIntegerParameter("cert_count",
                                                     cert_chain->len)));
   SECStatus rv;
   rv = SSL_RestartHandshakeAfterCertReq(nss_fd_, cert, key, cert_chain);
   if (rv != SECSuccess)
     return MapNSSError(PORT_GetError());
 
   GotoState(STATE_HANDSHAKE);
+  set_was_origin_bound_cert_sent(true);
   return OK;
 }
 
 int SSLClientSocketNSS::DoVerifyDNSSEC(int result) {
   if (ssl_config_.dns_cert_provenance_checking_enabled &&
       dns_cert_checker_) {
     PeerCertificateChain certs(nss_fd_);
     dns_cert_checker_->DoAsyncVerification(
         host_and_port_.host(), certs.AsStringPieceVector());
   }
@@ skipping 535 matching lines @@
     return SECWouldBlock;
   }
   net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_GET_ORIGIN_BOUND_CERT,
                                     error);
 
   SECStatus rv = SECSuccess;
   if (error == OK) {
     // Synchronous success.
     int result = ImportOBCertAndKey(result_certificate,
                                     result_private_key);
-    if (result != OK)
+    if (result == OK)
+      set_was_origin_bound_cert_sent(true);
+    else
       rv = SECFailure;

[wtc, 2011/12/07 22:59:59]

Nit: let's take the opportunity to add curly braces to this
if-else statement.

Note: in the early days, code in src/net followed the
convention that only one-line if statements omitted the curly
braces.  If there is an "else", then it's not considered
one line.  This convention is followed in this file.

This seems to be the personal preference of some early
Chrome developers.  It is not documented in the Style Guide.
So I will mention it to new team members, but leave it up
to them.

[Ryan Hamilton, 2011/12/07 23:02:31]

Done.

   } else {
     rv = SECFailure;  // Synchronous failure.
   }
 
   int cert_count = (rv == SECSuccess) ? 1 : 0;
   net_log_.AddEvent(NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
       make_scoped_refptr(new NetLogIntegerParameter("cert_count",
                                                     cert_count)));
   return rv;
 }
@@ skipping 467 matching lines @@
   valid_thread_id_ = base::PlatformThread::CurrentId();
 }
 
 bool SSLClientSocketNSS::CalledOnValidThread() const {
   EnsureThreadIdAssigned();
   base::AutoLock auto_lock(lock_);
   return valid_thread_id_ == base::PlatformThread::CurrentId();
 }
 
 }  // namespace net