Added ActivityLog tests and associated bugfixes/extra logging.

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();
 
   var processNatives = requireNative('process');
   var manifestVersion = processNatives.GetManifestVersion();
   var extensionId = processNatives.GetExtensionId();
 
+  var logActivity = requireNative('activityLogger').LogActivity;
+
   // The reserved channel name for the sendRequest/sendMessage APIs.
   // Note: sendRequest is deprecated.
   chromeHidden.kRequestChannel = "chrome.extension.sendRequest";
   chromeHidden.kMessageChannel = "chrome.runtime.sendMessage";
   chromeHidden.kNativeMessageChannel = "chrome.runtime.sendNativeMessage";
 
   // Map of port IDs to port object.
   var ports = {};
 
   // Map of port IDs to chromeHidden.onUnload listeners. Keep track of these
@@ skipping 129 matching lines @@
           responseCallbackPreserved =
               rv && rv.results && rv.results.indexOf(true) > -1;
           if (!responseCallbackPreserved && port) {
             // If they didn't access the response callback, they're not
             // going to send a response, so clean up the port immediately.
             port.destroy_();
             port = null;
           }
         }
       });
+      var eventName = (isSendMessage ?
+            (isExternal ?
+                "runtime.onMessageExternal" : "runtime.onMessage") :
+            (isExternal ?
+                "extension.onRequestExternal" : "extension.onRequest"));
+      logActivity("EVENT",
+                  targetExtensionId,
+                  eventName,
+                  [sourceExtensionId]);
       return true;
     }
     return false;
   }
 
   // Called by native code when a channel has been opened to this context.
   chromeHidden.Port.dispatchOnConnect = function(portId, channelName, tab,
                                                  sourceExtensionId,
                                                  targetExtensionId) {
     // Only create a new Port if someone is actually listening for a connection.
@@ skipping 22 matching lines @@
     }
 
     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;
 
+      var eventName = (isExternal ?
+          "runtime.onConnectExternal" : "runtime.onConnect");
       connectEvent.dispatch(port);
+      logActivity("EVENT",
+                  targetExtensionId,
+                  eventName,
+                  [sourceExtensionId]);
       return true;
     }
     return false;
   };
 
   // Called by native code when a channel has been closed.
   chromeHidden.Port.dispatchOnDisconnect = function(
       portId, errorMessage) {
     var port = ports[portId];
     if (port) {
@@ skipping 79 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;