3 files changed, 13 insertions, 6 deletions
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index cb22bce..8d07d82 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -262,7 +262,7 @@ class ExtensionImpl : public ExtensionBase {
         v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
     DCHECK(!current_context.IsEmpty());
     GetPendingRequestMap()[request_id].reset(new PendingRequest(
-        current_context, *v8::String::AsciiValue(args.Data())));
+        current_context, name));
 
     renderview->SendExtensionRequest(name, json_args, request_id, has_callback);
 
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index eb128c7..5ec2309 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file. aa1 -->
+without changes to the corresponding grd file. rw -->
 <grit latest_public_release="0" current_release="1">
   <outputs>
     <output filename="grit/renderer_resources.h" type="rc_header">
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index f132e55..3155c05 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -61,11 +61,16 @@ var chrome = chrome || {};
   chromeHidden.handleResponse = function(requestId, name,
                                          success, response, error) {
     try {
-      if (!success) {
-        if (!error)
+      if (success) {
+        delete chrome.extension.lastError;
+      } else {
+        if (!error) {
           error = "Unknown error."
+        }
         console.error("Error during " + name + ": " + error);
-        return;
+        chrome.extension.lastError = {
+          "message": error
+        };
       }
 
       if (callbacks[requestId]) {
@@ -77,6 +82,7 @@ var chrome = chrome || {};
       }
     } finally {
       delete callbacks[requestId];
+      delete chrome.extension.lastError;
     }
   };
 
@@ -94,8 +100,9 @@ var chrome = chrome || {};
     
     // Calls with one argument expect singular argument. Calls with multiple
     // expect a list.
-    if (argCount == 1)
+    if (argCount == 1) {
       request.args = args[0];
+    }
     if (argCount > 1) {
       request.args = [];
       for (var k = 0; k < argCount; k++) {