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

net/proxy/proxy_resolver_v8_tracing.cc

 // Copyright (c) 2013 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/proxy/proxy_resolver_v8_tracing.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/cancellation_flag.h"
@@ skipping 36 matching lines @@
 // under the tracing optimization. It is not expected to hit this normally.
 const size_t kMaxUniqueResolveDnsPerExec = 20;
 
 // Approximate number of bytes to use for buffering alerts() and errors.
 // This is a failsafe in case repeated executions of the script causes
 // too much memory bloat. It is not expected for well behaved scripts to
 // hit this. (In fact normal scripts should not even have alerts() or errors).
 const size_t kMaxAlertsAndErrorsBytes = 2048;
 
 // Returns event parameters for a PAC error message (line number + message).
-base::Value* NetLogErrorCallback(int line_number,
-                                 const base::string16* message,
-                                 NetLogCaptureMode /* capture_mode */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+scoped_ptr<base::Value> NetLogErrorCallback(
+    int line_number,
+    const base::string16* message,
+    NetLogCaptureMode /* capture_mode */) {
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("line_number", line_number);
   dict->SetString("message", *message);
-  return dict;
+  return dict.Pass();
 }
 
 }  // namespace
 
 // The Job class is responsible for executing GetProxyForURL() and
 // SetPacScript(), since both of these operations share similar code.
 //
 // The DNS for these operations can operate in either blocking or
 // non-blocking mode. Blocking mode is used as a fallback when the PAC script
 // seems to be misbehaving under the tracing optimization.
@@ skipping 837 matching lines @@
     // error
     // -------------------
     if (line_number == -1)
       VLOG(1) << "PAC-error: " << message;
     else
       VLOG(1) << "PAC-error: " << "line: " << line_number << ": " << message;
 
     // Send the error to the NetLog.
     LogEventToCurrentRequestAndGlobally(
         NetLog::TYPE_PAC_JAVASCRIPT_ERROR,
-        base::Bind(&NetLogErrorCallback, line_number, &message));
+        base::Bind(NetLogErrorCallback, line_number, &message));
 
     if (error_observer())
       error_observer()->OnPACScriptError(line_number, message);
   }
 }
 
 void ProxyResolverV8Tracing::Job::LogEventToCurrentRequestAndGlobally(
     NetLog::EventType type,
     const NetLog::ParametersCallback& parameters_callback) {
   CheckIsOnWorkerThread();
@@ skipping 93 matching lines @@
   DCHECK(!set_pac_script_job_.get());
   CHECK_EQ(0, num_outstanding_callbacks_);
 
   set_pac_script_job_ = new Job(this);
   set_pac_script_job_->StartSetPacScript(script_data, callback);
 
   return ERR_IO_PENDING;
 }
 
 }  // namespace net