Attempting to fix problems in 11571014.

chrome/renderer/resources/extensions/miscellaneous_bindings.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.
 
 // This contains unprivileged javascript APIs for extensions and apps.  It
 // can be loaded by any extension-related context, such as content scripts or
 // background pages. See user_script_slave.cc for script that is loaded by
 // content scripts only.
 
   require('json_schema');
@@ skipping 103 matching lines @@
           " send a response after the listener returns ";
     } else {
       errorMsg =
           "Cannot send a response more than once per " + eventName +
           " listener per document";
     }
     errorMsg += " (message was sent by extension " + sourceExtensionId;
     if (sourceExtensionId != targetExtensionId)
       errorMsg += " for extension " + targetExtensionId;
     errorMsg += ").";
-    lastError.set(errorMsg);
+    lastError.set(errorMsg, chrome);
     console.error("Could not send response: " + errorMsg);
   }
 
   // Helper function for dispatchOnConnect
   function dispatchOnRequest(portId, channelName, sender,
                              sourceExtensionId, targetExtensionId,
                              isExternal) {
     var isSendMessage = channelName == chromeHidden.kMessageChannel;
     var requestEvent = (isSendMessage ?
         (isExternal ?
@@ skipping 91 matching lines @@
   // Called by native code when a channel has been closed.
   chromeHidden.Port.dispatchOnDisconnect = function(
       portId, connectionInvalid) {
     var port = ports[portId];
     if (port) {
       // Update the renderer's port bookkeeping, without notifying the browser.
       CloseChannel(portId, false);
       if (connectionInvalid) {
         var errorMsg =
             "Could not establish connection. Receiving end does not exist.";
-        lastError.set(errorMsg);
+        lastError.set(errorMsg, chrome);
         console.error("Port error: " + errorMsg);
       }
       try {
         port.onDisconnect.dispatch(port);
       } finally {
         port.destroy_();
-        lastError.clear();
+        lastError.clear(chrome);
       }
     }
   };
 
   // Called by native code when a message has been sent to the given port.
   chromeHidden.Port.dispatchOnMessage = function(msg, portId) {
     var port = ports[portId];
     if (port) {
       if (msg) {
         msg = json.parse(msg);
@@ skipping 60 matching lines @@
     var targetId = null;
     if (lastArg >= 0)
       targetId = args[lastArg--];
 
     if (lastArg != -1)
       throw new Error('Invalid arguments to ' + functionName + '.');
     return [targetId, request, responseCallback];
   }
 
 exports.sendMessageUpdateArguments = sendMessageUpdateArguments;