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

chrome/browser/renderer_host/render_view_host.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 "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_widget_types.h"
+#include "base/json_reader.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
@@ skipping 1187 matching lines @@
           HasDOMUIBindings(process()->id())) {
     NOTREACHED() << "Blocked unauthorized use of DOMUIBindings.";
     return;
   }
 
   // DOMUI doesn't use these values yet.
   // TODO(aa): When DOMUI is ported to ExtensionFunctionDispatcher, send real
   // values here.
   const int kRequestId = -1;
   const bool kHasCallback = false;
+  scoped_ptr<Value> value;
+  if (!content.empty()) {
+    value.reset(JSONReader::Read(content, false));
+    if (!value.get()) {
+      // The page sent us something that we didn't understand.
+      // This probably indicates a programming error.
+      NOTREACHED() << "Invalid JSON argument in OnMsgDOMUISend.";
+      return;
+    }
+  }
 
-  delegate_->ProcessDOMUIMessage(message, content, kRequestId, kHasCallback);
+  delegate_->ProcessDOMUIMessage(message, value.get(),
+                                 kRequestId, kHasCallback);
 }
 
 void RenderViewHost::OnMsgForwardMessageToExternalHost(
     const std::string& message, const std::string& origin,
     const std::string& target) {
   delegate_->ProcessExternalHostMessage(message, origin, target);
 }
 
 void RenderViewHost::OnMsgDocumentLoadedInFrame() {
   RenderViewHostDelegate::Resource* resource_delegate =
@@ skipping 392 matching lines @@
 }
 
 void RenderViewHost::ForwardMessageFromExternalHost(const std::string& message,
                                                     const std::string& origin,
                                                     const std::string& target) {
   Send(new ViewMsg_HandleMessageFromExternalHost(routing_id(), message, origin,
                                                  target));
 }
 
 void RenderViewHost::OnExtensionRequest(const std::string& name,
-                                        const std::string& args,
+                                        const ListValue& args_holder,
                                         int request_id,
                                         bool has_callback) {
   if (!ChildProcessSecurityPolicy::GetInstance()->
           HasExtensionBindings(process()->id())) {
     // This can happen if someone uses window.open() to open an extension URL
     // from a non-extension context.
     BlockExtensionRequest(request_id);
     return;
   }
 
+  // The renderer sends the args in a 1-element list to make serialization
+  // easier.
+  Value* args = NULL;
+  if (!args_holder.IsType(Value::TYPE_LIST) ||
+      !static_cast<const ListValue*>(&args_holder)->Get(0, &args)) {
+    NOTREACHED();
+    return;
+  }
+
   delegate_->ProcessDOMUIMessage(name, args, request_id, has_callback);
 }
 
 void RenderViewHost::SendExtensionResponse(int request_id, bool success,
                                            const std::string& response,
                                            const std::string& error) {
   Send(new ViewMsg_ExtensionResponse(routing_id(), request_id, success,
       response, error));
 }
 
@@ skipping 23 matching lines @@
 #endif
 }
 
 void RenderViewHost::OnCSSInserted() {
   delegate_->DidInsertCSS();
 }
 
 void RenderViewHost::UpdateBrowserWindowId(int window_id) {
   Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id));
 }