| Index: chrome/renderer/resources/extension_process_bindings.js
|
| diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
|
| index 5a9fcf1b49d29da657cc03d1f3175a7fb9fe99a7..d025f7b7be8f8e5d3ca48bd55c390b68b2e66291 100644
|
| --- a/chrome/renderer/resources/extension_process_bindings.js
|
| +++ b/chrome/renderer/resources/extension_process_bindings.js
|
| @@ -86,7 +86,7 @@ var chrome;
|
|
|
| if (callbacks[requestId]) {
|
| if (response) {
|
| - callbacks[requestId](goog.json.parse(response));
|
| + callbacks[requestId](JSON.parse(response));
|
| } else {
|
| callbacks[requestId]();
|
| }
|
| @@ -98,7 +98,10 @@ var chrome;
|
|
|
| // Send an API request and optionally register a callback.
|
| function sendRequest(request, args, callback) {
|
| - var sargs = goog.json.serialize(args);
|
| + // JSON.stringify doesn't support a root object which is undefined.
|
| + if (args === undefined)
|
| + args = null;
|
| + var sargs = JSON.stringify(args);
|
| var requestId = GetNextRequestId();
|
| var hasCallback = false;
|
| if (callback) {
|
|
|