Revert 203489 "Replace JSON (de)serialization of extension messa..."

trunk/src/chrome/renderer/resources/extensions/miscellaneous_bindings.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.
 
 // This contains unprivileged javascript APIs for extensions and apps.  It
 // can be loaded by any extension-related context, such as content scripts or
 // background pages. See user_script_slave.cc for script that is loaded by
 // content scripts only.
 
   require('json_schema');
+  var json = require('json');
   var lastError = require('lastError');
   var miscNatives = requireNative('miscellaneous_bindings');
   var chrome = requireNative('chrome').GetChrome();
   var CloseChannel = miscNatives.CloseChannel;
   var PortAddRef = miscNatives.PortAddRef;
   var PortRelease = miscNatives.PortRelease;
   var PostMessage = miscNatives.PostMessage;
   var BindToGC = miscNatives.BindToGC;
 
   var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
@@ skipping 26 matching lines @@
   function PortImpl(portId, opt_name) {
     this.portId_ = portId;
     this.name = opt_name;
     this.onDisconnect = new chrome.Event();
     this.onMessage = new chrome.Event();
   }
 
   // Sends a message asynchronously to the context on the other end of this
   // port.
   PortImpl.prototype.postMessage = function(msg) {
-    PostMessage(this.portId_, msg);
+    // json.stringify doesn't support a root object which is undefined.
+    if (msg === undefined)
+      msg = null;
+    PostMessage(this.portId_, json.stringify(msg));
   };
 
   // Disconnects the port from the other end.
   PortImpl.prototype.disconnect = function() {
     CloseChannel(this.portId_, true);
     this.destroy_();
   };
 
   PortImpl.prototype.destroy_ = function() {
     var portId = this.portId_;
@@ skipping 187 matching lines @@
       } finally {
         port.destroy_();
         lastError.clear(chrome);
       }
     }
   };
 
   // Called by native code when a message has been sent to the given port.
   chromeHidden.Port.dispatchOnMessage = function(msg, portId) {
     var port = ports[portId];
-    if (port)
+    if (port) {
+      if (msg) {
+        msg = json.parse(msg);
+      }
       port.onMessage.dispatch(msg, port);
+    }
   };
 
   // Shared implementation used by tabs.sendMessage and runtime.sendMessage.
   chromeHidden.Port.sendMessageImpl = function(port, request,
                                                responseCallback) {
     if (port.name != chromeHidden.kNativeMessageChannel)
       port.postMessage(request);
 
     if (port.name == chromeHidden.kMessageChannel && !responseCallback) {
       // TODO(mpcomplete): Do this for the old sendRequest API too, after
@@ skipping 47 matching lines @@
     var targetId = null;
     if (lastArg >= 0)
       targetId = args[lastArg--];
 
     if (lastArg != -1)
       throw new Error('Invalid arguments to ' + functionName + '.');
     return [targetId, request, responseCallback];
   }
 
 exports.sendMessageUpdateArguments = sendMessageUpdateArguments;