Move the chromeHidden.toJSON paranoia out of event.js and into json.js, a new

chrome/renderer/resources/extensions/event.js

 // Copyright (c) 2012 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.
 
   var DCHECK = requireNative('logging').DCHECK;
   var eventBindingsNatives = requireNative('event_bindings');
   var AttachEvent = eventBindingsNatives.AttachEvent;
   var DetachEvent = eventBindingsNatives.DetachEvent;
   var AttachFilteredEvent = eventBindingsNatives.AttachFilteredEvent;
   var DetachFilteredEvent = eventBindingsNatives.DetachFilteredEvent;
@@ skipping 23 matching lines @@
     var eventType = utils.lookup(eventsSchema.types, 'id', 'events.Event');
 
     ruleFunctionSchemas.addRules =
         utils.lookup(eventType.functions, 'name', 'addRules');
     ruleFunctionSchemas.getRules =
         utils.lookup(eventType.functions, 'name', 'getRules');
     ruleFunctionSchemas.removeRules =
         utils.lookup(eventType.functions, 'name', 'removeRules');
   }
 
-  // Local implementation of JSON.parse & JSON.stringify that protect us
-  // from being clobbered by an extension.
-  //
-  // TODO(aa): This makes me so sad. We shouldn't need it, as we can just pass
-  // Values directly over IPC without serializing to strings and use
-  // JSONValueConverter.
-  chromeHidden.JSON = new (function() {
-    var $Object = Object;
-    var $Array = Array;
-    var $jsonStringify = JSON.stringify;
-    var $jsonParse = JSON.parse;
-
-    this.stringify = function(thing) {
-      var customizedObjectToJSON = $Object.prototype.toJSON;
-      var customizedArrayToJSON = $Array.prototype.toJSON;
-      if (customizedObjectToJSON !== undefined) {
-        $Object.prototype.toJSON = null;
-      }
-      if (customizedArrayToJSON !== undefined) {
-        $Array.prototype.toJSON = null;
-      }
-      try {
-        return $jsonStringify(thing);
-      } finally {
-        if (customizedObjectToJSON !== undefined) {
-          $Object.prototype.toJSON = customizedObjectToJSON;
-        }
-        if (customizedArrayToJSON !== undefined) {
-          $Array.prototype.toJSON = customizedArrayToJSON;
-        }
-      }
-    };
-
-    this.parse = function(thing) {
-      return $jsonParse(thing);
-    };
-  })();
-
   // A map of event names to the event object that is registered to that name.
   var attachedNamedEvents = {};
 
   // An array of all attached event objects, used for detaching on unload.
   var allAttachedEvents = [];
 
   // A map of functions that massage event arguments before they are dispatched.
   // Key is event name, value is function.
   var eventArgumentMassagers = {};
 
@@ skipping 408 matching lines @@
       if (event)
         event.detach_();
     }
   };
 
   chromeHidden.dispatchError = function(msg) {
     console.error(msg);
   };
 
   exports.Event = chrome.Event;