| Index: net/socket/ssl_client_socket_nss.cc
|
| diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
|
| index 37d2642b3f55b2dcee54777ebaa85d82f8a14812..787449153f9a31a0f3ae0ca4c9ca978106f6ee5e 100644
|
| --- a/net/socket/ssl_client_socket_nss.cc
|
| +++ b/net/socket/ssl_client_socket_nss.cc
|
| @@ -317,8 +317,9 @@ class SSLFailedNSSFunctionParams : public NetLog::EventParameters {
|
| void LogFailedNSSFunction(const BoundNetLog& net_log,
|
| const char* function,
|
| const char* param) {
|
| - net_log.AddEvent(NetLog::TYPE_SSL_NSS_ERROR,
|
| - new SSLFailedNSSFunctionParams(function, param));
|
| + net_log.AddEvent(
|
| + NetLog::TYPE_SSL_NSS_ERROR,
|
| + make_scoped_refptr(new SSLFailedNSSFunctionParams(function, param)));
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -1544,7 +1545,8 @@ int SSLClientSocketNSS::DoReadLoop(int result) {
|
| if (!nss_bufs_) {
|
| LOG(DFATAL) << "!nss_bufs_";
|
| int rv = ERR_UNEXPECTED;
|
| - net_log_.AddEvent(NetLog::TYPE_SSL_READ_ERROR, new SSLErrorParams(rv, 0));
|
| + net_log_.AddEvent(NetLog::TYPE_SSL_READ_ERROR,
|
| + make_scoped_refptr(new SSLErrorParams(rv, 0)));
|
| return rv;
|
| }
|
|
|
| @@ -1570,7 +1572,8 @@ int SSLClientSocketNSS::DoWriteLoop(int result) {
|
| if (!nss_bufs_) {
|
| LOG(DFATAL) << "!nss_bufs_";
|
| int rv = ERR_UNEXPECTED;
|
| - net_log_.AddEvent(NetLog::TYPE_SSL_WRITE_ERROR, new SSLErrorParams(rv, 0));
|
| + net_log_.AddEvent(NetLog::TYPE_SSL_WRITE_ERROR,
|
| + make_scoped_refptr(new SSLErrorParams(rv, 0)));
|
| return rv;
|
| }
|
|
|
| @@ -1899,7 +1902,7 @@ int SSLClientSocketNSS::DoHandshake() {
|
| if (client_auth_cert_needed_) {
|
| net_error = ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
|
| net_log_.AddEvent(NetLog::TYPE_SSL_HANDSHAKE_ERROR,
|
| - new SSLErrorParams(net_error, 0));
|
| + make_scoped_refptr(new SSLErrorParams(net_error, 0)));
|
| // If the handshake already succeeded (because the server requests but
|
| // doesn't require a client cert), we need to invalidate the SSL session
|
| // so that we won't try to resume the non-client-authenticated session in
|
| @@ -1956,7 +1959,7 @@ int SSLClientSocketNSS::DoHandshake() {
|
| rv = SECFailure;
|
| net_error = ERR_SSL_PROTOCOL_ERROR;
|
| net_log_.AddEvent(NetLog::TYPE_SSL_HANDSHAKE_ERROR,
|
| - new SSLErrorParams(net_error, 0));
|
| + make_scoped_refptr(new SSLErrorParams(net_error, 0)));
|
| }
|
| } else {
|
| PRErrorCode prerr = PR_GetError();
|
| @@ -1968,8 +1971,9 @@ int SSLClientSocketNSS::DoHandshake() {
|
| } else {
|
| LOG(ERROR) << "handshake failed; NSS error code " << prerr
|
| << ", net_error " << net_error;
|
| - net_log_.AddEvent(NetLog::TYPE_SSL_HANDSHAKE_ERROR,
|
| - new SSLErrorParams(net_error, prerr));
|
| + net_log_.AddEvent(
|
| + NetLog::TYPE_SSL_HANDSHAKE_ERROR,
|
| + make_scoped_refptr(new SSLErrorParams(net_error, prerr)));
|
| }
|
| }
|
|
|
| @@ -2287,7 +2291,7 @@ int SSLClientSocketNSS::DoPayloadRead() {
|
| LeaveFunction("");
|
| rv = ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
|
| net_log_.AddEvent(NetLog::TYPE_SSL_READ_ERROR,
|
| - new SSLErrorParams(rv, 0));
|
| + make_scoped_refptr(new SSLErrorParams(rv, 0)));
|
| return rv;
|
| }
|
| if (rv >= 0) {
|
| @@ -2302,7 +2306,8 @@ int SSLClientSocketNSS::DoPayloadRead() {
|
| }
|
| LeaveFunction("");
|
| rv = MapNSPRError(prerr);
|
| - net_log_.AddEvent(NetLog::TYPE_SSL_READ_ERROR, new SSLErrorParams(rv, prerr));
|
| + net_log_.AddEvent(NetLog::TYPE_SSL_READ_ERROR,
|
| + make_scoped_refptr(new SSLErrorParams(rv, prerr)));
|
| return rv;
|
| }
|
|
|
| @@ -2323,7 +2328,7 @@ int SSLClientSocketNSS::DoPayloadWrite() {
|
| LeaveFunction("");
|
| rv = MapNSPRError(prerr);
|
| net_log_.AddEvent(NetLog::TYPE_SSL_WRITE_ERROR,
|
| - new SSLErrorParams(rv, prerr));
|
| + make_scoped_refptr(new SSLErrorParams(rv, prerr)));
|
| return rv;
|
| }
|
|
|
|
|