Use Value objects instead of JSON strings in extension API response IPCs.

When we're sending the result of an extension API method call, we currently
convert a Value object into a JSON string in the browser process, and then call
JSON.parse in javascript on the renderer side. This CL changes that to pass the
Value object in the IPC, and uses V8ValueConverter to turn the Value into the
appropriate v8 native object, avoiding the need to parse JSON.

This is a first step towards supporting binary data for API request
parameters and responses.

BUG=122675
TEST=No new functionality ; existing unit and browser tests should still pass.

Review URL: https://chromiumcodereview.appspot.com/10041047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133133 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 30 insertions, 17 deletions

diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 9b2744c..0a28bf6 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -863,7 +863,7 @@ Feature::Context ExtensionDispatcher::ClassifyJavaScriptContext(
 
 void ExtensionDispatcher::OnExtensionResponse(int request_id,
                                               bool success,
-                                              const std::string& response,
+                                              const base::ListValue& response,
                                               const std::string& error) {
   request_sender_->HandleResponse(request_id, success, response, error);
 }
diff --git a/chrome/renderer/extensions/extension_dispatcher.h b/chrome/renderer/extensions/extension_dispatcher.h
index 4e87366..cb7f60a 100644
--- a/chrome/renderer/extensions/extension_dispatcher.h
+++ b/chrome/renderer/extensions/extension_dispatcher.h
@@ -102,7 +102,7 @@ class ExtensionDispatcher : public content::RenderProcessObserver {
 
   void OnExtensionResponse(int request_id,
                            bool success,
-                           const std::string& response,
+                           const base::ListValue& response,
                            const std::string& error);
 
   // Checks that the current context contains an extension that has permission
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index 41fd732..3aba7c4 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -277,7 +277,7 @@ void ExtensionHelper::DidCreateDataSource(WebFrame* frame, WebDataSource* ds) {
 
 void ExtensionHelper::OnExtensionResponse(int request_id,
                                           bool success,
-                                          const std::string& response,
+                                          const base::ListValue& response,
                                           const std::string& error) {
   extension_dispatcher_->OnExtensionResponse(request_id,
                                              success,
@@ -287,7 +287,7 @@ void ExtensionHelper::OnExtensionResponse(int request_id,
 
 void ExtensionHelper::OnExtensionMessageInvoke(const std::string& extension_id,
                                                const std::string& function_name,
-                                               const ListValue& args,
+                                               const base::ListValue& args,
                                                const GURL& event_url,
                                                bool user_gesture) {
   scoped_ptr<WebScopedUserGesture> web_user_gesture;
diff --git a/chrome/renderer/extensions/extension_helper.h b/chrome/renderer/extensions/extension_helper.h
index a1ed3ed..2376b94 100644
--- a/chrome/renderer/extensions/extension_helper.h
+++ b/chrome/renderer/extensions/extension_helper.h
@@ -74,7 +74,7 @@ class ExtensionHelper
                                    WebKit::WebDataSource* ds) OVERRIDE;
 
   void OnExtensionResponse(int request_id, bool success,
-                           const std::string& response,
+                           const base::ListValue& response,
                            const std::string& error);
   void OnExtensionMessageInvoke(const std::string& extension_id,
                                 const std::string& function_name,
diff --git a/chrome/renderer/extensions/extension_request_sender.cc b/chrome/renderer/extensions/extension_request_sender.cc
index 9b6ce3f..dd9d712 100644
--- a/chrome/renderer/extensions/extension_request_sender.cc
+++ b/chrome/renderer/extensions/extension_request_sender.cc
@@ -10,10 +10,13 @@
 #include "chrome/renderer/extensions/chrome_v8_context_set.h"
 #include "chrome/renderer/extensions/extension_dispatcher.h"
 #include "content/public/renderer/render_view.h"
+#include "content/public/renderer/v8_value_converter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
+using content::V8ValueConverter;
+
 // Contains info relevant to a pending API request.
 struct PendingRequest {
  public :
@@ -122,7 +125,7 @@ void ExtensionRequestSender::StartRequest(
 
 void ExtensionRequestSender::HandleResponse(int request_id,
                                             bool success,
-                                            const std::string& response,
+                                            const base::ListValue& response,
                                             const std::string& error) {
   linked_ptr<PendingRequest> request = RemoveRequest(request_id);
 
@@ -138,11 +141,24 @@ void ExtensionRequestSender::HandleResponse(int request_id,
     return;  // The frame went away.
 
   v8::HandleScope handle_scope;
+  v8::Handle<v8::Value> response_value = v8::Undefined();
+  DCHECK(response.GetSize() <= 1);
+  if (response.GetSize() == 1) {
+    // We use a ListValue as a wrapper (our IPC system can't handle Value
+    // directly since it has a private constructor) so we need to extract the
+    // value at index 0.
+    Value* value = NULL;
+    CHECK(response.Get(0, &value));
+    CHECK(value);
+    scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
+    response_value = converter->ToV8Value(value, v8_context->v8_context());
+  }
+
   v8::Handle<v8::Value> argv[5];
   argv[0] = v8::Integer::New(request_id);
   argv[1] = v8::String::New(request->name.c_str());
   argv[2] = v8::Boolean::New(success);
-  argv[3] = v8::String::New(response.c_str());
+  argv[3] = response_value;
   argv[4] = v8::String::New(error.c_str());
 
   v8::Handle<v8::Value> retval;
diff --git a/chrome/renderer/extensions/extension_request_sender.h b/chrome/renderer/extensions/extension_request_sender.h
index 3188e43..20f7baf 100644
--- a/chrome/renderer/extensions/extension_request_sender.h
+++ b/chrome/renderer/extensions/extension_request_sender.h
@@ -42,7 +42,7 @@ class ExtensionRequestSender {
   // Handles responses from the extension host to calls made by StartRequest().
   void HandleResponse(int request_id,
                       bool success,
-                      const std::string& response,
+                      const base::ListValue& response,
                       const std::string& error);
 
 
diff --git a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js b/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
index 2423cfb..3f702b7 100644
--- a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
@@ -14,10 +14,9 @@ chromeHidden.registerCustomHook('fileBrowserPrivate', function(bindingsAPI) {
 
   apiFunctions.setCustomCallback('requestLocalFileSystem',
                                  function(name, request, response) {
-    var resp = response ? [chromeHidden.JSON.parse(response)] : [];
     var fs = null;
-    if (!resp[0].error)
-      fs = GetLocalFileSystem(resp[0].name, resp[0].path);
+    if (response && !response.error)
+      fs = GetLocalFileSystem(response.name, response.path);
     if (request.callback)
       request.callback(fs);
     request.callback = null;
diff --git a/chrome/renderer/resources/extensions/page_capture_custom_bindings.js b/chrome/renderer/resources/extensions/page_capture_custom_bindings.js
index 0bcbb0b..15b82f9 100644
--- a/chrome/renderer/resources/extensions/page_capture_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/page_capture_custom_bindings.js
@@ -15,9 +15,8 @@ chromeHidden.registerCustomHook('pageCapture', function(bindingsAPI) {
 
   apiFunctions.setCustomCallback('saveAsMHTML',
                                  function(name, request, response) {
-    var params = chromeHidden.JSON.parse(response);
-    var path = params.mhtmlFilePath;
-    var size = params.mhtmlFileLength;
+    var path = response.mhtmlFilePath;
+    var size = response.mhtmlFileLength;
 
     if (request.callback)
       request.callback(CreateBlob(path, size));
diff --git a/chrome/renderer/resources/extensions/send_request.js b/chrome/renderer/resources/extensions/send_request.js
index 3e47f40..045e270 100644
--- a/chrome/renderer/resources/extensions/send_request.js
+++ b/chrome/renderer/resources/extensions/send_request.js
@@ -29,7 +29,7 @@ chromeHidden.handleResponse = function(requestId, name,
 
     if (request.callback) {
       // Callbacks currently only support one callback argument.
-      var callbackArgs = response ? [chromeHidden.JSON.parse(response)] : [];
+      var callbackArgs = typeof(response) != "undefined" ? [response] : [];
 
       // Validate callback in debug only -- and only when the
       // caller has provided a callback. Implementations of api
@@ -44,7 +44,6 @@ chromeHidden.handleResponse = function(requestId, name,
           if (request.callbackSchema.parameters.length > 1) {
             throw new Error("Callbacks may only define one parameter");
           }
-
           chromeHidden.validate(callbackArgs,
               request.callbackSchema.parameters);
         } catch (exception) {
@@ -53,7 +52,7 @@ chromeHidden.handleResponse = function(requestId, name,
         }
       }
 
-      if (response) {
+      if (typeof(response) != "undefined") {
         request.callback(callbackArgs[0]);
       } else {
         request.callback();