Unify logic of stack trace generation for extension errors

extensions/renderer/resources/send_request.js

 // Copyright 2014 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 handleUncaughtException = require('uncaught_exception_handler').handle;
+var exceptionHandler = require('uncaught_exception_handler');
 var lastError = require('lastError');
 var logging = requireNative('logging');
 var natives = requireNative('sendRequest');
-var processNatives = requireNative('process');
 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;
 
 // Runs a user-supplied callback safely.
 function safeCallbackApply(name, request, callback, args) {
   try {
     $Function.apply(callback, request, args);
   } catch (e) {
-    var errorMessage = "Error in response to " + name + ": " + e;
-    if (request.stack && request.stack != '')
-      errorMessage += "\n" + request.stack;
-    handleUncaughtException(errorMessage, e);
+    exceptionHandler.handle('Error in response to ' + name, e, request.stack);
   }
 }
 
 // Callback handling.
 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 callerChrome = chrome;
 
@@ skipping 48 matching lines @@
       console.error("Unchecked runtime.lastError while running " +
           (name || "unknown") + ": " + error +
           (request.stack ? "\n" + request.stack : ""));
     }
   } finally {
     delete requests[requestId];
     lastError.clear(chrome);
     if (callerChrome !== chrome)
       lastError.clear(callerChrome);
   }
-};
-
-function getExtensionStackTrace(call_name) {
-  var stack = $String.split(new Error().stack, '\n');
-  var id = processNatives.GetExtensionId();
-
-  // Remove stack frames before and after that weren't associated with the
-  // extension.
-  return $Array.join(stack.filter(function(line) {
-    return line.indexOf(id) != -1;
-  }), '\n');
 }
 
 function prepareRequest(args, argSchemas) {
   var request = {};
   var argCount = args.length;
 
   // Look for callback param.
   if (argSchemas.length > 0 &&
       argSchemas[argSchemas.length - 1].type == "function") {
     request.callback = args[args.length - 1];
@@ skipping 16 matching lines @@
 // - 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) {
   calledSendRequest = true;
   if (!optArgs)
     optArgs = {};
   var request = prepareRequest(args, argSchemas);
-  request.stack = getExtensionStackTrace();
+  request.stack = exceptionHandler.getExtensionStackTrace();
   if (optArgs.customCallback) {
     request.customCallback = optArgs.customCallback;
   }
 
   var nativeFunction = optArgs.nativeFunction || natives.StartRequest;
 
   var requestId = natives.GetNextRequestId();
   request.id = requestId;
   requests[requestId] = request;
 
@@ skipping 11 matching lines @@
 }
 
 function clearCalledSendRequest() {
   calledSendRequest = false;
 }
 
 exports.sendRequest = sendRequest;
 exports.getCalledSendRequest = getCalledSendRequest;
 exports.clearCalledSendRequest = clearCalledSendRequest;
 exports.safeCallbackApply = safeCallbackApply;
-exports.getExtensionStackTrace = getExtensionStackTrace;
 
 // Called by C++.
 exports.handleResponse = handleResponse;