DevTools: pass class and method name as arguments to RPC messages

chrome/browser/debugger/inspectable_tab_proxy.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/debugger/inspectable_tab_proxy.h"
 
 #include "base/json_reader.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
@@ skipping 18 matching lines @@
 }
 
 void DevToolsClientHostImpl::SendMessageToClient(
     const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(DevToolsClientHostImpl, msg)
     IPC_MESSAGE_HANDLER(DevToolsClientMsg_RpcMessage, OnRpcMessage);
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }
 
-void DevToolsClientHostImpl::OnRpcMessage(const std::string& msg) {
+void DevToolsClientHostImpl::OnRpcMessage(const std::string& class_name,
+                                          const std::string& message_name,
+                                          const std::string& msg) {
   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());
-  std::string class_name;
-  list_msg->GetString(0, &class_name);
-  std::string message_name;
-  list_msg->GetString(1, &message_name);
   if (class_name == kDebuggerAgentDelegate && message_name == kDebuggerOutput) {
     std::string str;
-    list_msg->GetString(2, &str);
+    list_msg->GetString(0, &str);
     DebuggerOutput(str);
   } else if (class_name == kToolsAgentDelegate &&
              message_name == kFrameNavigate) {
     std::string url;
-    list_msg->GetString(2, &url);
+    list_msg->GetString(0, &url);
     FrameNavigate(url);
   }
 }
 
 void DevToolsClientHostImpl::DebuggerOutput(const std::string& msg) {
   service_->DebuggerOutput(id_, msg);
 }
 
 void DevToolsClientHostImpl::FrameNavigate(const std::string& url) {
   service_->FrameNavigate(id_, url);
@@ skipping 37 matching lines @@
   return client_host;
 }
 
 void InspectableTabProxy::OnRemoteDebuggerDetached() {
   while (id_to_client_host_map_.size() > 0) {
     IdToClientHostMap::iterator it = id_to_client_host_map_.begin();
     it->second->debugger_remote_service()->DetachFromTab(IntToString(it->first),
                                                          NULL);
   }
 }