Make ExtensionMsg_MessageInvoke run a module system function rather than a

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 logging = requireNative('logging');
 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 calledSendRequest = false;
 
 // Callback handling.
-chromeHidden.handleResponse = function(requestId, name,
-                                       success, responseList, error) {
+function handleResponse(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];
-    DCHECK(request != null);
+    logging.DCHECK(request != null);
 
     // lastError needs to be set on the caller's chrome object no matter what,
     // though chances are it's the same as ours (it will be different when
     // calling API methods on other contexts).
     if (request.callback) {
       var chromeForCallback = natives.GetGlobal(request.callback).chrome;
       if (chromeForCallback != chrome)
         chromesForLastError.push(chromeForCallback);
     }
 
     forEach(chromesForLastError, function(i, c) {lastError.clear(c)});
     if (!success) {
       if (!error)
         error = "Unknown error.";
       forEach(chromesForLastError, function(i, c) {
         lastError.set(name, error, request.stack, c)
       });
     }
 
     if (request.customCallback) {
       var customCallbackArgs = [name, request].concat(responseList);
       request.customCallback.apply(request, customCallbackArgs);
     }
 
     if (request.callback) {
       // Validate callback in debug only -- and only when the
       // caller has provided a callback. Implementations of api
       // calls may not return data if they observe the caller
       // has not provided a callback.
-      if (chromeHidden.validateCallbacks && !error) {
+      if (logging.DCHECK_IS_ON() && !error) {
         try {
           if (!request.callbackSchema.parameters) {
             throw new Error("No callback schemas defined");
           }
 
           validate(responseList, request.callbackSchema.parameters);
         } catch (exception) {
           return "Callback validation error during " + name + " -- " +
                  exception.stack;
         }
       }
 
-      request.callback.apply(request, responseList);
+      try {
+        request.callback.apply(request, responseList);
+      } catch (e) {
+        var errorMessage = "Error in response to " + name + ": " + e;
+        if (request.stack && request.stack != '')
+          errorMessage += "\n" + request.stack;
+        console.error(errorMessage);
+      }
     }
   } finally {
     delete requests[requestId];
     forEach(chromesForLastError, function(i, c) {lastError.clear(c)});
   }
 };
 
 function getExtensionStackTrace(call_name) {
   var stack = new Error().stack.split('\n');
 
@@ skipping 76 matching lines @@
   return calledSendRequest;
 }
 
 function clearCalledSendRequest() {
   calledSendRequest = false;
 }
 
 exports.sendRequest = sendRequest;
 exports.getCalledSendRequest = getCalledSendRequest;
 exports.clearCalledSendRequest = clearCalledSendRequest;
+
+// Called by C++.
+exports.handleResponse = handleResponse;