Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value…

net/ssl/openssl_ssl_util.cc

 // Copyright 2014 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/ssl/openssl_ssl_util.h"
 
 #include <errno.h>
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ skipping 134 matching lines @@
         return ERR_SSL_VERSION_OR_CIPHER_MISMATCH;
       }
       return ERR_SSL_PROTOCOL_ERROR;
     }
     default:
       LOG(WARNING) << "Unmapped error reason: " << ERR_GET_REASON(error_code);
       return ERR_SSL_PROTOCOL_ERROR;
   }
 }
 
-base::Value* NetLogOpenSSLErrorCallback(int net_error,
-                                        int ssl_error,
-                                        const OpenSSLErrorInfo& error_info,
-                                        NetLogCaptureMode /* capture_mode */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+scoped_ptr<base::Value> NetLogOpenSSLErrorCallback(
+    int net_error,
+    int ssl_error,
+    const OpenSSLErrorInfo& error_info,
+    NetLogCaptureMode /* capture_mode */) {
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("net_error", net_error);
   dict->SetInteger("ssl_error", ssl_error);
   if (error_info.error_code != 0) {
     dict->SetInteger("error_lib", ERR_GET_LIB(error_info.error_code));
     dict->SetInteger("error_reason", ERR_GET_REASON(error_info.error_code));
   }
   if (error_info.file != NULL)
     dict->SetString("file", error_info.file);
   if (error_info.line != 0)
     dict->SetInteger("line", error_info.line);
-  return dict;
+  return dict.Pass();
 }
 
 }  // namespace
 
 void OpenSSLPutNetError(const tracked_objects::Location& location, int err) {
   // Net error codes are negative. Encode them as positive numbers.
   err = -err;
   if (err < 0 || err > 0xfff) {
     // OpenSSL reserves 12 bits for the reason code.
     NOTREACHED();
@@ skipping 48 matching lines @@
       // TODO(joth): Implement full mapping.
       LOG(WARNING) << "Unknown OpenSSL error " << err;
       return ERR_SSL_PROTOCOL_ERROR;
   }
 }
 
 NetLog::ParametersCallback CreateNetLogOpenSSLErrorCallback(
     int net_error,
     int ssl_error,
     const OpenSSLErrorInfo& error_info) {
-  return base::Bind(&NetLogOpenSSLErrorCallback,
-                    net_error, ssl_error, error_info);
+  return base::Bind(NetLogOpenSSLErrorCallback, net_error, ssl_error,
+                    error_info);
 }
 
 }  // namespace net