Modify extension request IPC messages to pass a ListValue instead of a string.

chrome/renderer/extensions/extension_process_bindings.cc

 // Copyright (c) 2009 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.
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #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"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
@@ skipping 323 matching lines @@
     std::string name = *v8::String::AsciiValue(args[0]);
     if (GetFunctionNameSet()->find(name) == GetFunctionNameSet()->end()) {
       NOTREACHED() << "Unexpected function " << name;
       return v8::Undefined();
     }
 
     if (!ExtensionProcessBindings::CurrentContextHasPermission(name)) {
       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();
   }
 
   static v8::Handle<v8::Value> GetRenderViewId(const v8::Arguments& args) {
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
     return v8::Integer::New(renderview->routing_id());
   }
@@ skipping 140 matching lines @@
     return;
 
   v8::HandleScope handle_scope;
   WebFrame* frame = view->mainFrame();
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
   v8::Handle<v8::Value> argv[1];
   argv[0] = v8::String::New(type_str);
   bindings_utils::CallFunctionInContext(context, "setViewType",
                                         arraysize(argv), argv);
 }