Add OSSTATUS_LOG API

net/socket/ssl_client_socket_mac.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#include "base/mac/mac_logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/string_util.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/ssl_info.h"
@@ skipping 170 matching lines @@
     //   access_denied
     //   bad_certificate
     //   unsupported_certificate
     //   certificate_expired
     //   certificate_revoked
     //   certificate_unknown
     //   unknown_ca
     case errSSLPeerCertUnknown...errSSLPeerBadCert:
     case errSSLPeerUnknownCA:
     case errSSLPeerAccessDenied:
-      LOG(WARNING) << "Server rejected client cert (OSStatus=" << status << ")";
+      OSSTATUS_LOG(WARNING, status) << "Server rejected client cert";
       return ERR_BAD_SSL_CLIENT_AUTH_CERT;
 
     case errSSLNegotiation:
     case errSSLPeerInsufficientSecurity:
     case errSSLPeerProtocolVersion:
       return ERR_SSL_VERSION_OR_CIPHER_MISMATCH;
 
     case errSSLBufferOverflow:
     case errSSLModuleAttach:
     case errSSLSessionNotFound:
     default:
-      LOG(WARNING) << "Unknown error " << status <<
-          " mapped to net::ERR_FAILED";
+      OSSTATUS_LOG(WARNING, status)
+          << "Unknown error mapped to net::ERR_FAILED";
       return ERR_FAILED;
   }
 }
 
 OSStatus OSStatusFromNetError(int net_error) {
   switch (net_error) {
     case ERR_IO_PENDING:
       return errSSLWouldBlock;
     case ERR_INTERNET_DISCONNECTED:
     case ERR_TIMED_OUT:
     case ERR_CONNECTION_ABORTED:
     case ERR_CONNECTION_RESET:
     case ERR_CONNECTION_REFUSED:
     case ERR_ADDRESS_UNREACHABLE:
     case ERR_ADDRESS_INVALID:
       return errSSLClosedAbort;
     case ERR_UNEXPECTED:
       return errSSLInternal;
     case ERR_INVALID_ARGUMENT:
       return paramErr;
     case OK:
       return noErr;
     default:
-      LOG(WARNING) << "Unknown error " << net_error <<
-          " mapped to paramErr";
+      LOG(WARNING) << "Unknown error " << net_error << " mapped to paramErr";
       return paramErr;
   }
 }
 
 // Converts from a cipher suite to its key size. If the suite is marked with a
 // **, it's not actually implemented in Secure Transport and won't be returned
 // (but we'll code for it anyway).  The reference here is
 // http://www.opensource.apple.com/darwinsource/10.5.5/libsecurity_ssl-32463/lib/cipherSpecs.c
 // Seriously, though, there has to be an API for this, but I can't find one.
 // Anybody?
@@ skipping 934 matching lines @@
 
 int SSLClientSocketMac::SetClientCert() {
   if (!ssl_config_.send_client_cert || !ssl_config_.client_cert)
     return noErr;
 
   base::mac::ScopedCFTypeRef<CFArrayRef> cert_refs(
       ssl_config_.client_cert->CreateClientCertificateChain());
   VLOG(1) << "SSLSetCertificate(" << CFArrayGetCount(cert_refs) << " certs)";
   OSStatus result = SSLSetCertificate(ssl_context_, cert_refs);
   if (result)
-    LOG(ERROR) << "SSLSetCertificate returned OSStatus " << result;
+    OSSTATUS_LOG(ERROR, result) << "SSLSetCertificate failed";
   return result;
 }
 
 int SSLClientSocketMac::DoPayloadRead() {
   size_t processed = 0;
   OSStatus status = SSLRead(ssl_context_, user_read_buf_->data(),
                             user_read_buf_len_, &processed);
   if (status == errSSLWouldBlock && renegotiating_) {
     CHECK_EQ(static_cast<size_t>(0), processed);
     next_handshake_state_ = STATE_HANDSHAKE;
@@ skipping 216 matching lines @@
   if (rv < 0 && rv != ERR_IO_PENDING) {
     us->write_io_buf_ = NULL;
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net