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

2 files changed, 8 insertions, 20 deletions

diff --git a/chrome/browser/debugger/inspectable_tab_proxy.cc b/chrome/browser/debugger/inspectable_tab_proxy.cc
index 7d584dc..29e5d32 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.cc
+++ b/chrome/browser/debugger/inspectable_tab_proxy.cc
@@ -4,9 +4,7 @@
 
 #include "chrome/browser/debugger/inspectable_tab_proxy.h"
 
-#include "base/json_reader.h"
 #include "base/string_util.h"
-#include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/debugger/debugger_remote_service.h"
@@ -38,31 +36,19 @@ void DevToolsClientHostImpl::SendMessageToClient(
 
 void DevToolsClientHostImpl::OnRpcMessage(const std::string& class_name,
                                           const std::string& message_name,
-                                          const std::string& msg) {
+                                          const std::string& param1,
+                                          const std::string& param2,
+                                          const std::string& param3) {
   static const std::string kDebuggerAgentDelegate = "DebuggerAgentDelegate";
   static const std::string kToolsAgentDelegate = "ToolsAgentDelegate";
   static const std::string kDebuggerOutput = "DebuggerOutput";
   static const std::string kFrameNavigate = "FrameNavigate";
 
-  scoped_ptr<Value> message(JSONReader::Read(msg, false));
-  if (!message->IsType(Value::TYPE_LIST)) {
-    NOTREACHED();  // The RPC protocol has changed :(
-    return;
-  }
-  ListValue* list_msg = static_cast<ListValue*>(message.get());
   if (class_name == kDebuggerAgentDelegate && message_name == kDebuggerOutput) {
-    std::string str;
-    if (!list_msg->GetString(0, &str))
-      return;
-    DebuggerOutput(str);
+    DebuggerOutput(param1);
   } else if (class_name == kToolsAgentDelegate &&
              message_name == kFrameNavigate) {
-    std::string url;
-    if (!list_msg->GetString(0, &url)) {
-      NOTREACHED();
-      return;
-    }
-    FrameNavigate(url);
+    FrameNavigate(param1);
   }
 }
 
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h
index 454d248..13da2ec 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.h
+++ b/chrome/browser/debugger/inspectable_tab_proxy.h
@@ -83,7 +83,9 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
   // Message handling routines
   void OnRpcMessage(const std::string& class_name,
                     const std::string& message_name,
-                    const std::string& msg);
+                    const std::string& param1,
+                    const std::string& param2,
+                    const std::string& param3);
   void DebuggerOutput(const std::string& msg);
   void FrameNavigate(const std::string& url);
   void TabClosed();