Fix a couple of bugs relating to sending Tab info with chrome.runtime.connect and

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');
@@ skipping 87 matching lines @@
     var port = new PortImpl(portId, opt_name);
     ports[portId] = port;
     portReleasers[portId] = PortRelease.bind(this, portId);
     chromeHidden.onUnload.addListener(portReleasers[portId]);
 
     PortAddRef(portId);
     return port;
   };
 
   // Helper function for dispatchOnRequest.
-  function handleSendRequestError(isSendMessage, responseCallbackPreserved,
-                                  sourceExtensionId, targetExtensionId) {
-    var errorMsg;
+  function handleSendRequestError(isSendMessage,
+                                  responseCallbackPreserved,
+                                  sourceExtensionId,
+                                  targetExtensionId,
+                                  sourceUrl) {
+    var errorMsg = [];
     var eventName = isSendMessage ? "runtime.onMessage" : "extension.onRequest";
     if (isSendMessage && !responseCallbackPreserved) {
-      errorMsg =
+      errorMsg.push(
           "The chrome." + eventName + " listener must return true if you " +
-          "want to send a response after the listener returns ";
+          "want to send a response after the listener returns");
     } else {
-      errorMsg =
+      errorMsg.push(
           "Cannot send a response more than once per chrome." + eventName +
-          " listener per document";
+          " listener per document");
     }
-    errorMsg += "(message was sent by extension " + sourceExtensionId;
-    if (sourceExtensionId != targetExtensionId)
-      errorMsg += " for extension " + targetExtensionId;
-    errorMsg += ").";
-    lastError.set(eventName, errorMsg, null, chrome);
+    errorMsg.push("(message was sent by extension" + sourceExtensionId);
+    if (sourceExtensionId != "" && sourceExtensionId != targetExtensionId)
+      errorMsg.push("for extension " + targetExtensionId);
+    if (sourceUrl != "")
+      errorMsg.push("for URL " + sourceUrl);
+    lastError.set(eventName, errorMsg.join(" ") + ").", null, chrome);
   }
 
   // Helper function for dispatchOnConnect
   function dispatchOnRequest(portId, channelName, sender,
-                             sourceExtensionId, targetExtensionId,
+                             sourceExtensionId, targetExtensionId, sourceUrl,
                              isExternal) {
     var isSendMessage = channelName == chromeHidden.kMessageChannel;
     var requestEvent = (isSendMessage ?
         (isExternal ?
             chrome.runtime.onMessageExternal : chrome.runtime.onMessage) :
         (isExternal ?
             chrome.extension.onRequestExternal : chrome.extension.onRequest));
     if (requestEvent.hasListeners()) {
       var port = chromeHidden.Port.createPort(portId, channelName);
       port.onMessage.addListener(function(request) {
@@ skipping 34 matching lines @@
           }
         }
       });
       var eventName = (isSendMessage ?
             (isExternal ?
                 "runtime.onMessageExternal" : "runtime.onMessage") :
             (isExternal ?
                 "extension.onRequestExternal" : "extension.onRequest"));
       logActivity.LogEvent(targetExtensionId,
                            eventName,
-                           [sourceExtensionId]);
+                           [sourceExtensionId, sourceUrl]);
       return true;
     }
     return false;
   }
 
   // Called by native code when a channel has been opened to this context.
-  chromeHidden.Port.dispatchOnConnect = function(portId, channelName, tab,
+  chromeHidden.Port.dispatchOnConnect = function(portId,
+                                                 channelName,
+                                                 sourceTab,
                                                  sourceExtensionId,
-                                                 targetExtensionId) {
+                                                 targetExtensionId,
+                                                 sourceUrl) {
     // Only create a new Port if someone is actually listening for a connection.
     // In addition to being an optimization, this also fixes a bug where if 2
     // channels were opened to and from the same process, closing one would
     // close both.
     if (targetExtensionId != extensionId)
       return false;  // not for us
     if (ports[getOppositePortId(portId)])
       return false;  // this channel was opened by us, so ignore it
 
     // Determine whether this is coming from another extension, so we can use
     // the right event.
     var isExternal = sourceExtensionId != extensionId;
 
-    if (tab)
-      tab = json.parse(tab);
-    var sender = {tab: tab, id: sourceExtensionId};
+    var sender = {id: sourceExtensionId};
+    if (sourceUrl)
+      sender.url = sourceUrl;
+    if (sourceTab)
+      sender.tab = sourceTab;
 
     // Special case for sendRequest/onRequest and sendMessage/onMessage.
     if (channelName == chromeHidden.kRequestChannel ||
         channelName == chromeHidden.kMessageChannel) {
       return dispatchOnRequest(portId, channelName, sender,
-                               sourceExtensionId, targetExtensionId,
+                               sourceExtensionId, targetExtensionId, sourceUrl,
                                isExternal);
     }
 
     var connectEvent = (isExternal ?
         chrome.runtime.onConnectExternal : chrome.runtime.onConnect);
     if (connectEvent.hasListeners()) {
       var port = chromeHidden.Port.createPort(portId, channelName);
       port.sender = sender;
       if (manifestVersion < 2)
         port.tab = port.sender.tab;
@@ skipping 96 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;