4 files changed, 30 insertions, 5 deletions
diff --git a/chrome/renderer/extensions/extension_api_client_unittest.cc b/chrome/renderer/extensions/extension_api_client_unittest.cc
index 1a06889..64002282 100644
--- a/chrome/renderer/extensions/extension_api_client_unittest.cc
+++ b/chrome/renderer/extensions/extension_api_client_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
+#include "base/json_reader.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
@@ -53,7 +54,14 @@ class ExtensionAPIClientTest : public RenderViewTest {
     ViewHostMsg_ExtensionRequest::Param params;
     ViewHostMsg_ExtensionRequest::Read(request_msg, &params);
     ASSERT_EQ(function.c_str(), params.a) << js;
-    ASSERT_EQ(arg1.c_str(), params.b) << js;
+
+    Value* args = NULL;
+    ASSERT_TRUE(params.b.IsType(Value::TYPE_LIST));
+    ASSERT_TRUE(static_cast<const ListValue*>(&params.b)->Get(0, &args));
+
+    JSONReader reader;
+    Value* arg1_value = reader.JsonToValue(arg1, false, false);
+    ASSERT_TRUE(args->Equals(arg1_value)) << js;
     render_thread_.sink().ClearMessages();
   }
 };
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 6603582..e083c7c 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -9,6 +9,7 @@
 
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 
+#include "base/json_reader.h"
 #include "base/singleton.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
@@ -352,17 +353,33 @@ class ExtensionImpl : public ExtensionBase {
       return ExtensionProcessBindings::ThrowPermissionDeniedException(name);
     }
 
-    std::string json_args = *v8::String::Utf8Value(args[1]);
+    std::string str_args = *v8::String::Utf8Value(args[1]);
     int request_id = args[2]->Int32Value();
     bool has_callback = args[3]->BooleanValue();
 
+    ListValue args_holder;
+    JSONReader reader;
+    Value* json_args = reader.JsonToValue(str_args, false, false);
+
+    // Since we do the serialization in the v8 extension, we should always get
+    // valid JSON.
+    if (!json_args) {
+      NOTREACHED() << "Invalid JSON passed to StartRequest.";
+      return v8::Undefined();
+    }
+
+    // Put the args in a 1-element list for easier serialization. Maybe all
+    // requests should have a list of args?
+    args_holder.Append(json_args);
+
     v8::Persistent<v8::Context> current_context =
         v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
     DCHECK(!current_context.IsEmpty());
     GetPendingRequestMap()[request_id].reset(new PendingRequest(
         current_context, name));
 
-    renderview->SendExtensionRequest(name, json_args, request_id, has_callback);
+    renderview->SendExtensionRequest(name, args_holder,
+                                     request_id, has_callback);
 
     return v8::Undefined();
   }
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 6888fbb..3cce3a9 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3297,7 +3297,7 @@ void RenderView::OnSetActive(bool active) {
 }
 
 void RenderView::SendExtensionRequest(const std::string& name,
-                                      const std::string& args,
+                                      const ListValue& args,
                                       int request_id,
                                       bool has_callback) {
   Send(new ViewHostMsg_ExtensionRequest(routing_id_, name, args, request_id,
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index cdd1c2c..ddcc1a4 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -414,7 +414,7 @@ class RenderView : public RenderWidget,
 
   void OnClearFocusedNode();
 
-  void SendExtensionRequest(const std::string& name, const std::string& args,
+  void SendExtensionRequest(const std::string& name, const ListValue& args,
                             int request_id, bool has_callback);
   void OnExtensionResponse(int request_id, bool success,
                            const std::string& response,