Added activity logging for ext APIs with custom bindings

chrome/renderer/resources/extensions/send_request.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 chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var DCHECK = requireNative('logging').DCHECK;
 var forEach = require('utils').forEach;
 var json = require('json');
 var lastError = require('lastError');
 var natives = requireNative('sendRequest');
 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 requestStatus = false;

[Matt Perry, 2013/03/15 23:33:21]

nit: I wouldn't guess what this for based on the name. How about
"didCallSendRequest"?

[felt, 2013/03/15 23:40:17]

Done.

+
 // Callback handling.
 chromeHidden.handleResponse = function(requestId, name,
                                        success, responseList, error) {
   // The chrome objects we will set lastError on. Really we should only be
   // setting this on the callback's chrome object, but set on ours too since
   // it's conceivable that something relies on that.
   var chromesForLastError = [chrome];
 
   try {
     var request = requests[requestId];
@@ skipping 70 matching lines @@
 // |optArgs| is an object with optional parameters as follows:
 // - noStringify: true if we should not stringify the request arguments.
 // - customCallback: a callback that should be called instead of the standard
 //   callback.
 // - nativeFunction: the v8 native function to handle the request, or
 //   StartRequest if missing.
 // - forIOThread: true if this function should be handled on the browser IO
 //   thread.
 // - preserveNullInObjects: true if it is safe for null to be in objects.
 function sendRequest(functionName, args, argSchemas, optArgs) {
+  requestStatus = true;
   if (!optArgs)
     optArgs = {};
   var request = prepareRequest(args, argSchemas);
   if (optArgs.customCallback) {
     request.customCallback = optArgs.customCallback;
   }
   // json.stringify doesn't support a root object which is undefined.
   if (request.args === undefined)
     request.args = null;
 
@@ skipping 11 matching lines @@
 
   var hasCallback = request.callback || optArgs.customCallback;
   return nativeFunction(functionName,
                         requestArgs,
                         requestId,
                         hasCallback,
                         optArgs.forIOThread,
                         optArgs.preserveNullInObjects);
 }
 
+function getRequestStatus() {
+  return requestStatus;
+}
+
+function setRequestStatus(status) {
+  requestStatus = status;
+}
+
 exports.sendRequest = sendRequest;
+exports.requestStatus = requestStatus;
+exports.getRequestStatus = getRequestStatus;
+exports.setRequestStatus = setRequestStatus;

[Matt Perry, 2013/03/15 23:33:21]

nit: better to expose a clearRequestStatus that always sets the status to false.

[felt, 2013/03/15 23:40:17]

Done.