DevTools: Remove base/values dependency from devtools.

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

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

4 files changed, 32 insertions, 12 deletions

diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index aef7125..74af788 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -44,10 +44,13 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
 
 void DevToolsAgent::SendMessageToClient(const std::string& class_name,
                                         const std::string& method_name,
-                                        const std::string& raw_msg) {
+                                        const std::string& param1,
+                                        const std::string& param2,
+                                        const std::string& param3) {
   IPC::Message* m = new ViewHostMsg_ForwardToDevToolsClient(
       routing_id_,
-      DevToolsClientMsg_RpcMessage(class_name, method_name, raw_msg));
+      DevToolsClientMsg_RpcMessage(class_name, method_name, param1, param2,
+                                   param3));
   view_->Send(m);
 }
 
@@ -85,10 +88,13 @@ void DevToolsAgent::OnDetach() {
 
 void DevToolsAgent::OnRpcMessage(const std::string& class_name,
                                  const std::string& method_name,
-                                 const std::string& raw_msg) {
+                                 const std::string& param1,
+                                 const std::string& param2,
+                                 const std::string& param3) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
-    web_agent->DispatchMessageFromClient(class_name, method_name, raw_msg);
+    web_agent->DispatchMessageFromClient(class_name, method_name, param1,
+                                         param2, param3);
   }
 }
 
diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h
index 985d677..25906ae 100644
--- a/chrome/renderer/devtools_agent.h
+++ b/chrome/renderer/devtools_agent.h
@@ -34,7 +34,9 @@ class DevToolsAgent : public WebDevToolsAgentDelegate {
   // WebDevToolsAgentDelegate implementation
   virtual void SendMessageToClient(const std::string& class_name,
                                    const std::string& method_name,
-                                   const std::string& raw_msg);
+                                   const std::string& param1,
+                                   const std::string& param2,
+                                   const std::string& param3);
   virtual int GetHostId();
   virtual void ForceRepaint();
 
@@ -52,7 +54,9 @@ class DevToolsAgent : public WebDevToolsAgentDelegate {
   void OnDetach();
   void OnRpcMessage(const std::string& class_name,
                     const std::string& method_name,
-                    const std::string& raw_msg);
+                    const std::string& param1,
+                    const std::string& param2,
+                    const std::string& param3);
   void OnInspectElement(int x, int y);
 
   static std::map<int, DevToolsAgent*> agent_for_routing_id_;
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index e2ccb60..01de15f 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -45,8 +45,11 @@ bool DevToolsClient::OnMessageReceived(const IPC::Message& message) {
 
 void DevToolsClient::SendMessageToAgent(const std::string& class_name,
                                         const std::string& method_name,
-                                        const std::string& raw_msg) {
-  Send(DevToolsAgentMsg_RpcMessage(class_name, method_name, raw_msg));
+                                        const std::string& param1,
+                                        const std::string& param2,
+                                        const std::string& param3) {
+  Send(DevToolsAgentMsg_RpcMessage(class_name, method_name, param1, param2,
+                                   param3));
 }
 
 void DevToolsClient::SendDebuggerCommandToAgent(const std::string& command) {
@@ -81,6 +84,9 @@ void DevToolsClient::ToggleInspectElementMode(bool enabled) {
 
 void DevToolsClient::OnRpcMessage(const std::string& class_name,
                                   const std::string& method_name,
-                                  const std::string& raw_msg) {
-  web_tools_client_->DispatchMessageFromAgent(class_name, method_name, raw_msg);
+                                  const std::string& param1,
+                                  const std::string& param2,
+                                  const std::string& param3) {
+  web_tools_client_->DispatchMessageFromAgent(class_name, method_name, param1,
+      param2, param3);
 }
diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h
index 200e068..188bcea 100644
--- a/chrome/renderer/devtools_client.h
+++ b/chrome/renderer/devtools_client.h
@@ -35,7 +35,9 @@ class DevToolsClient : public WebDevToolsClientDelegate {
   // WebDevToolsClient::Delegate implementation
   virtual void SendMessageToAgent(const std::string& class_name,
                                   const std::string& method_name,
-                                  const std::string& raw_msg);
+                                  const std::string& param1,
+                                  const std::string& param2,
+                                  const std::string& param3);
   virtual void SendDebuggerCommandToAgent(const std::string& command);
 
   virtual void ActivateWindow();
@@ -47,7 +49,9 @@ class DevToolsClient : public WebDevToolsClientDelegate {
  private:
   void OnRpcMessage(const std::string& class_name,
                     const std::string& method_name,
-                    const std::string& raw_msg);
+                    const std::string& param1,
+                    const std::string& param2,
+                    const std::string& param3);
 
   // Sends message to DevToolsAgent.
   void Send(const IPC::Message& tools_agent_message);