Added activity logging for ext APIs with custom bindings

chrome/renderer/resources/extensions/send_request.js

Index: chrome/renderer/resources/extensions/send_request.js
diff --git a/chrome/renderer/resources/extensions/send_request.js b/chrome/renderer/resources/extensions/send_request.js
index a805578ef41ce49b3b7148b7a3e4e3b05d2a4591..a31d641e522b8f3986ca30fe3745d9cdd8ceb5b3 100644
--- a/chrome/renderer/resources/extensions/send_request.js
+++ b/chrome/renderer/resources/extensions/send_request.js
@@ -13,6 +13,10 @@ var validate = require('schemaUtils').validate;
 // All outstanding requests from sendRequest().
 var requests = {};
 
+// Used to prevent double Activity Logging for API calls that use both custom
+// bindings and ExtensionFunctions (via sendRequest).
+var calledSendRequest = false;
+
 // Callback handling.
 chromeHidden.handleResponse = function(requestId, name,
                                        success, responseList, error) {
@@ -103,6 +107,7 @@ function prepareRequest(args, argSchemas) {
 //   thread.
 // - preserveNullInObjects: true if it is safe for null to be in objects.
 function sendRequest(functionName, args, argSchemas, optArgs) {
+  calledSendRequest = true;
   if (!optArgs)
     optArgs = {};
   var request = prepareRequest(args, argSchemas);
@@ -134,4 +139,14 @@ function sendRequest(functionName, args, argSchemas, optArgs) {
                         optArgs.preserveNullInObjects);
 }
 
+function getCalledSendRequest() {
+  return calledSendRequest;
+}
+
+function clearCalledSendRequest() {
+  calledSendRequest = false;
+}
+
 exports.sendRequest = sendRequest;
+exports.getCalledSendRequest = getCalledSendRequest;
+exports.clearCalledSendRequest = clearCalledSendRequest;