| Index: net/proxy/proxy_resolver_v8_tracing.cc
|
| diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc
|
| index ce5cb5f881c9d34e391acf01091d5e5241a7c390..72ff8abdb1825e0fe65e2128eef0287f42e64316 100644
|
| --- a/net/proxy/proxy_resolver_v8_tracing.cc
|
| +++ b/net/proxy/proxy_resolver_v8_tracing.cc
|
| @@ -54,13 +54,14 @@ const size_t kMaxUniqueResolveDnsPerExec = 20;
|
| 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
|
| @@ -918,7 +919,7 @@ void ProxyResolverV8Tracing::Job::DispatchAlertOrError(
|
| // 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);
|
|
|