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

net/socket/nss_ssl_util.cc

 // 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/nss_ssl_util.h"
 
 #include <nss.h>
 #include <secerr.h>
 #include <ssl.h>
 #include <sslerr.h>
@@ skipping 61 matching lines @@
 // CiphersCopy copies the zero-terminated array |in| to |out|. It returns the
 // number of cipher suite ids copied.
 size_t CiphersCopy(const uint16* in, uint16* out) {
   for (size_t i = 0; ; i++) {
     if (in[i] == 0)
       return i;
     out[i] = in[i];
   }
 }
 
-base::Value* NetLogSSLErrorCallback(int net_error,
-                                    int ssl_lib_error,
-                                    NetLogCaptureMode /* capture_mode */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+scoped_ptr<base::Value> NetLogSSLErrorCallback(
+    int net_error,
+    int ssl_lib_error,
+    NetLogCaptureMode /* capture_mode */) {
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("net_error", net_error);
   if (ssl_lib_error)
     dict->SetInteger("ssl_lib_error", ssl_lib_error);
-  return dict;
+  return dict.Pass();
 }
 
 class NSSSSLInitSingleton {
  public:
   NSSSSLInitSingleton() : model_fd_(NULL) {
     crypto::EnsureNSSInit();
 
     NSS_SetDomesticPolicy();
 
     const PRUint16* const ssl_ciphers = SSL_GetImplementedCiphers();
@@ skipping 274 matching lines @@
       LOG(WARNING) << "Unknown error " << err << " (" << err_name << ")"
                    << " mapped to net::ERR_FAILED";
       return ERR_FAILED;
     }
   }
 }
 
 // Returns parameters to attach to the NetLog when we receive an error in
 // response to a call to an NSS function.  Used instead of
 // NetLogSSLErrorCallback with events of type TYPE_SSL_NSS_ERROR.
-base::Value* NetLogSSLFailedNSSFunctionCallback(
+scoped_ptr<base::Value> NetLogSSLFailedNSSFunctionCallback(
     const char* function,
     const char* param,
     int ssl_lib_error,
     NetLogCaptureMode /* capture_mode */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetString("function", function);
   if (param[0] != '\0')
     dict->SetString("param", param);
   dict->SetInteger("ssl_lib_error", ssl_lib_error);
-  return dict;
+  return dict.Pass();
 }
 
 void LogFailedNSSFunction(const BoundNetLog& net_log,
                           const char* function,
                           const char* param) {
   DCHECK(function);
   DCHECK(param);
-  net_log.AddEvent(
-      NetLog::TYPE_SSL_NSS_ERROR,
-      base::Bind(&NetLogSSLFailedNSSFunctionCallback,
-                 function, param, PR_GetError()));
+  net_log.AddEvent(NetLog::TYPE_SSL_NSS_ERROR,
+                   base::Bind(NetLogSSLFailedNSSFunctionCallback, function,
+                              param, PR_GetError()));
 }
 
 NetLog::ParametersCallback CreateNetLogSSLErrorCallback(int net_error,
                                                         int ssl_lib_error) {
-  return base::Bind(&NetLogSSLErrorCallback, net_error, ssl_lib_error);
+  return base::Bind(NetLogSSLErrorCallback, net_error, ssl_lib_error);
 }
 
 }  // namespace net