DevTools: use WebDevToolsMessageData for devtools rpc messages

Review URL: http://codereview.chromium.org/463065

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

2 files changed, 6 insertions, 13 deletions

diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index 99f515b..dcf6375 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -80,16 +80,12 @@ void ExtensionDevToolsBridge::SendMessageToClient(const IPC::Message& msg) {
 static const char kApuAgentClassName[] = "ApuAgentDelegate";
 static const char kApuPageEventMessageName[] = "DispatchToApu";
 
-void ExtensionDevToolsBridge::OnRpcMessage(const std::string& class_name,
-                                           const std::string& message_name,
-                                           const std::string& param1,
-                                           const std::string& param2,
-                                           const std::string& param3) {
+void ExtensionDevToolsBridge::OnRpcMessage(const DevToolsMessageData& data) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
-  if (class_name == kApuAgentClassName
-      && message_name == kApuPageEventMessageName) {
-    std::string json = StringPrintf("[%s]", param1.c_str());
+  if (data.class_name == kApuAgentClassName
+      && data.method_name == kApuPageEventMessageName) {
+    std::string json = StringPrintf("[%s]", data.arguments[0].c_str());
     profile_->GetExtensionMessageService()->DispatchEventToRenderers(
         on_page_event_name_, json);
   }
diff --git a/chrome/browser/extensions/extension_devtools_bridge.h b/chrome/browser/extensions/extension_devtools_bridge.h
index 1745ef7..5543b97 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.h
+++ b/chrome/browser/extensions/extension_devtools_bridge.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/extensions/extension_message_service.h"
 
 class Profile;
+struct DevToolsMessageData;
 
 // This class is a DevToolsClientHost that fires extension events.
 class ExtensionDevToolsBridge : public DevToolsClientHost {
@@ -31,11 +32,7 @@ class ExtensionDevToolsBridge : public DevToolsClientHost {
   virtual void SendMessageToClient(const IPC::Message& msg);
 
  private:
-  void OnRpcMessage(const std::string& class_name,
-                    const std::string& message_name,
-                    const std::string& param1,
-                    const std::string& param2,
-                    const std::string& param3);
+  void OnRpcMessage(const DevToolsMessageData& data);
 
   // ID of the tab we are monitoring.
   int tab_id_;