Merge 48667 - Prevent extensions from clobbering JSON implementation that ext...

chrome/renderer/resources/extension_process_bindings.js

 // Copyright (c) 2010 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.
 
 // This script contains privileged chrome extension related javascript APIs.
 // It is loaded by pages whose URL has the chrome-extension protocol.
 
 var chrome = chrome || {};
 (function() {
   native function GetExtensionAPIDefinition();
@@ skipping 63 matching lines @@
           "message": error
         };
       }
 
       if (request.customCallback) {
         request.customCallback(name, request, response);
       }
 
       if (request.callback) {
         // Callbacks currently only support one callback argument.
-        var callbackArgs = response ? [JSON.parse(response)] : [];
+        var callbackArgs = response ? [chromeHidden.JSON.parse(response)] : [];
 
         // Validate callback in debug only -- and only when the
         // caller has provided a callback. Implementations of api
         // calls my not return data if they observe the caller
         // has not provided a callback.
         if (chromeHidden.validateCallbacks && !error) {
           try {
             if (!request.callbackSchema.parameters) {
               throw "No callback schemas defined";
             }
@@ skipping 71 matching lines @@
   // Send an API request and optionally register a callback.
   function sendRequest(functionName, args, argSchemas, customCallback) {
     var request = prepareRequest(args, argSchemas);
     if (customCallback) {
       request.customCallback = customCallback;
     }
     // JSON.stringify doesn't support a root object which is undefined.
     if (request.args === undefined)
       request.args = null;
 
-    // Some javascript libraries (e.g. prototype.js version <= 1.6) add a toJSON
-    // serializer function on Array.prototype that is incompatible with our
-    // native JSON library, causing incorrect deserialization in the C++ side of
-    // StartRequest. We work around that here by temporarily removing the toJSON
-    // function.
-    var arrayToJsonTmp;
-    if (Array.prototype.toJSON) {
-      arrayToJsonTmp = Array.prototype.toJSON;
-      Array.prototype.toJSON = null;
-    }
-    var sargs = JSON.stringify(request.args);
-    if (arrayToJsonTmp) {
-      Array.prototype.toJSON = arrayToJsonTmp;
-    }
+    var sargs = chromeHidden.JSON.stringify(request.args);
+
     var requestId = GetNextRequestId();
     requests[requestId] = request;
     var hasCallback = (request.callback || customCallback) ? true : false;
     return StartRequest(functionName, sargs, requestId, hasCallback);
   }
 
   // Send a special API request that is not JSON stringifiable, and optionally
   // register a callback.
   function sendCustomRequest(nativeFunction, functionName, args, argSchemas) {
     var request = prepareRequest(args, argSchemas);
@@ skipping 117 matching lines @@
     // name & definition of the apiFunction. Custom handling of api functions
     // is implemented by adding a "handleRequest" function to the object.
     var apiFunctions = {};
 
     // Read api definitions and setup api functions in the chrome namespace.
     // TODO(rafaelw): Consider defining a json schema for an api definition
     //   and validating either here, in a unit_test or both.
     // TODO(rafaelw): Handle synchronous functions.
     // TOOD(rafaelw): Consider providing some convenient override points
     //   for api functions that wish to insert themselves into the call.
-    var apiDefinitions = JSON.parse(GetExtensionAPIDefinition());
+    var apiDefinitions = chromeHidden.JSON.parse(GetExtensionAPIDefinition());
 
     apiDefinitions.forEach(function(apiDef) {
       var module = chrome;
       var namespaces = apiDef.namespace.split('.');
       for (var index = 0, name; name = namespaces[index]; index++) {
         module[name] = module[name] || {};
         module = module[name];
       };
 
       // Add types to global validationTypes
@@ skipping 254 matching lines @@
     };
 
     apiFunctions["experimental.contextMenu.create"].customCallback =
         function(name, request, response) {
       if (chrome.extension.lastError || !response) {
         return;
       }
 
       // Set up the onclick handler if we were passed one in the request.
       if (request.args.onclick) {
-        var menuItemId = JSON.parse(response);
+        var menuItemId = chromeHidden.JSON.parse(response);
         chromeHidden.contextMenuHandlers[menuItemId] = request.args.onclick;
       }
     };
 
     apiFunctions["experimental.contextMenu.remove"].customCallback =
         function(name, request, response) {
       // Remove any onclick handler we had registered for this menu item.
       if (request.args.length > 0) {
         var menuItemId = request.args[0];
         delete chromeHidden.contextMenuHandlers[menuItemId];
@@ skipping 29 matching lines @@
     setupPopupEvents(GetRenderViewId());
     setupHiddenContextMenuEvent(extensionId);
   });
 
   if (!chrome.experimental)
     chrome.experimental = {};
 
   if (!chrome.experimental.accessibility)
     chrome.experimental.accessibility = {};
 })();