| Index: chrome/browser/extensions/api/proxy/proxy_api.cc
|
| diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc
|
| index 8548ad8cf8ceac845f464c0da13710269bb515ee..ff945d3afd06a99b2fb1132f1ad341b7af528e2c 100644
|
| --- a/chrome/browser/extensions/api/proxy/proxy_api.cc
|
| +++ b/chrome/browser/extensions/api/proxy/proxy_api.cc
|
| @@ -37,22 +37,19 @@ void ProxyEventRouter::OnProxyError(
|
| EventRouterForwarder* event_router,
|
| void* profile,
|
| int error_code) {
|
| - ListValue args;
|
| + scoped_ptr<ListValue> args(new ListValue());
|
| DictionaryValue* dict = new DictionaryValue();
|
| dict->SetBoolean(keys::kProxyEventFatal, true);
|
| dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code));
|
| dict->SetString(keys::kProxyEventDetails, "");
|
| - args.Append(dict);
|
| -
|
| - std::string json_args;
|
| - base::JSONWriter::Write(&args, &json_args);
|
| + args->Append(dict);
|
|
|
| if (profile) {
|
| event_router->DispatchEventToRenderers(
|
| - keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
|
| + keys::kProxyEventOnProxyError, args.Pass(), profile, true, GURL());
|
| } else {
|
| event_router->BroadcastEventToRenderers(
|
| - keys::kProxyEventOnProxyError, json_args, GURL());
|
| + keys::kProxyEventOnProxyError, args.Pass(), GURL());
|
| }
|
| }
|
|
|
| @@ -61,7 +58,7 @@ void ProxyEventRouter::OnPACScriptError(
|
| void* profile,
|
| int line_number,
|
| const string16& error) {
|
| - ListValue args;
|
| + scoped_ptr<ListValue> args(new ListValue());
|
| DictionaryValue* dict = new DictionaryValue();
|
| dict->SetBoolean(keys::kProxyEventFatal, false);
|
| dict->SetString(keys::kProxyEventError,
|
| @@ -74,17 +71,14 @@ void ProxyEventRouter::OnPACScriptError(
|
| error_msg = UTF16ToUTF8(error);
|
| }
|
| dict->SetString(keys::kProxyEventDetails, error_msg);
|
| - args.Append(dict);
|
| -
|
| - std::string json_args;
|
| - base::JSONWriter::Write(&args, &json_args);
|
| + args->Append(dict);
|
|
|
| if (profile) {
|
| event_router->DispatchEventToRenderers(
|
| - keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
|
| + keys::kProxyEventOnProxyError, args.Pass(), profile, true, GURL());
|
| } else {
|
| event_router->BroadcastEventToRenderers(
|
| - keys::kProxyEventOnProxyError, json_args, GURL());
|
| + keys::kProxyEventOnProxyError, args.Pass(), GURL());
|
| }
|
| }
|
|
|
|
|