[Extensions Bindings] Don't load lastError module with native bindings

extensions/renderer/resources/messaging.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.
 
 // chrome.runtime.messaging API implementation.
 // TODO(robwu): Fix this indentation.
 
   // TODO(kalman): factor requiring chrome out of here.
   var chrome = requireNative('chrome').GetChrome();
-  var lastError = require('lastError');
   var logActivity = requireNative('activityLogger');
   var logging = requireNative('logging');
   var messagingNatives = requireNative('messaging_natives');
   var processNatives = requireNative('process');
   var utils = require('utils');
   var messagingUtils = require('messaging_utils');
 
   // The reserved channel name for the sendRequest/send(Native)Message APIs.
   // Note: sendRequest is deprecated.
   var kRequestChannel = "chrome.extension.sendRequest";
@@ skipping 18 matching lines @@
     return new jsEvent(undefined, schema, options);
   }
 
   function invalidateEvent(event) {
     if (bindingUtil)
       bindingUtil.invalidateEvent(event);
     else
       privates(event).impl.destroy_();
   }
 
+  var jsLastError = bindingUtil ? undefined : require('lastError');
+  function setLastError(name, error) {
+    if (bindingUtil)
+      bindingUtil.setLastError(error);
+    else
+      jsLastError.set(name, error, null, chrome);
+  }
+
+  function clearLastError() {
+    if (bindingUtil)
+      bindingUtil.clearLastError();
+    else
+      jsLastError.clear(chrome);
+  }
+
+  function hasLastError() {
+    if (bindingUtil)
+      return bindingUtil.hasLastError();
+    else
+      return jsLastError.hasError(chrome);
+  }
+
   // Map of port IDs to port object.
   var ports = {__proto__: null};
 
   // Port object.  Represents a connection to another script context through
   // which messages can be passed.
   function PortImpl(portId, opt_name) {
     this.portId_ = portId;
     this.name = opt_name;
 
     // Note: Keep these schemas in sync with the documentation in runtime.json
@@ skipping 86 matching lines @@
       errorMsg =
         'Cannot send a response more than once per chrome.' + eventName +
         ' listener per document';
     }
     errorMsg += ' (message was sent by extension' + sourceExtensionId;
     if (sourceExtensionId && sourceExtensionId !== targetExtensionId)
       errorMsg += ' for extension ' + targetExtensionId;
     if (sourceUrl)
       errorMsg += ' for URL ' + sourceUrl;
     errorMsg += ').';
-    lastError.set(eventName, errorMsg, null, chrome);
+    setLastError(eventName, errorMsg);
   }
 
   // Helper function for dispatchOnConnect
   function dispatchOnRequest(portId, channelName, sender,
                              sourceExtensionId, targetExtensionId, sourceUrl,
                              isExternal) {
     var isSendMessage = channelName == kMessageChannel;
     var requestEvent = null;
     if (isSendMessage) {
       if (chrome.runtime) {
@@ skipping 175 matching lines @@
                          [sourceExtensionId]);
     return true;
   };
 
   // Called by native code when a channel has been closed.
   function dispatchOnDisconnect(portId, errorMessage) {
     var port = ports[portId];
     if (port) {
       delete ports[portId];
       if (errorMessage)
-        lastError.set('Port', errorMessage, null, chrome);
+        setLastError('Port', errorMessage);
       try {
         port.onDisconnect.dispatch(port);
       } finally {
         privates(port).impl.destroy_();
-        lastError.clear(chrome);
+        clearLastError();
       }
     }
   };
 
   // Called by native code when a message has been sent to the given port.
   function dispatchOnMessage(msg, portId) {
     var port = ports[portId];
     if (port) {
       if (msg)
         msg = $JSON.parse(msg);
@@ skipping 32 matching lines @@
     // Note: make sure to manually remove the onMessage/onDisconnect listeners
     // that we added before destroying the Port, a workaround to a bug in Port
     // where any onMessage/onDisconnect listeners added but not removed will
     // be leaked when the Port is destroyed.
     // http://crbug.com/320723 tracks a sustainable fix.
 
     function disconnectListener() {
       if (!responseCallback)
         return;
 
-      if (lastError.hasError(chrome)) {
+      if (hasLastError()) {
         sendResponseAndClearCallback();
       } else {
-        lastError.set(
+        setLastError(
             port.name,
-            'The message port closed before a response was received.', null,
-            chrome);
+            'The message port closed before a response was received.');
         try {
           sendResponseAndClearCallback();
         } finally {
-          lastError.clear(chrome);
+          clearLastError();
         }
       }
     }
 
     function messageListener(response) {
       try {
         if (responseCallback)
           sendResponseAndClearCallback(response);
       } finally {
         port.disconnect();
@@ skipping 34 matching lines @@
 exports.$set('kNativeMessageChannel', kNativeMessageChannel);
 exports.$set('Port', Port);
 exports.$set('createPort', createPort);
 exports.$set('sendMessageImpl', sendMessageImpl);
 exports.$set('sendMessageUpdateArguments', sendMessageUpdateArguments);
 
 // For C++ code to call.
 exports.$set('dispatchOnConnect', dispatchOnConnect);
 exports.$set('dispatchOnDisconnect', dispatchOnDisconnect);
 exports.$set('dispatchOnMessage', dispatchOnMessage);