DevTools: Get rid of DevTools RPC.

chrome/browser/debugger/devtools_http_protocol_handler.cc

 // Copyright (c) 2010 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/devtools_http_protocol_handler.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 29 matching lines @@
   virtual void InspectedTabClosing() {
     ChromeThread::PostTask(
         ChromeThread::IO,
         FROM_HERE,
         NewRunnableMethod(socket_,
                           &HttpListenSocket::Close));
   }
 
   virtual void SendMessageToClient(const IPC::Message& msg) {
     IPC_BEGIN_MESSAGE_MAP(DevToolsClientHostImpl, msg)
-      IPC_MESSAGE_HANDLER(DevToolsClientMsg_RpcMessage, OnRpcMessage);
+      IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend,
+                          OnDispatchOnInspectorFrontend);
       IPC_MESSAGE_UNHANDLED_ERROR()
     IPC_END_MESSAGE_MAP()
   }
 
   void NotifyCloseListener() {
     DevToolsClientHost::NotifyCloseListener();
   }
  private:
   // Message handling routines
-  void OnRpcMessage(const DevToolsMessageData& data) {
+  void OnDispatchOnInspectorFrontend(const std::string& data) {
     std::string message;
-    message += "devtools$$dispatch(\"" + data.class_name + "\", \"" +
-        data.method_name + "\"";
-    for (std::vector<std::string>::const_iterator it = data.arguments.begin();
-         it != data.arguments.end(); ++it) {
-      std::string param = *it;
-      if (!param.empty())
-        message += ", " + param;
-    }
-    message += ")";
+    message += "devtools$$dispatch(\"" + data + "\")";
     socket_->SendOverWebSocket(message);
   }
   HttpListenSocket* socket_;
 };
 
 }
 
 DevToolsHttpProtocolHandler::~DevToolsHttpProtocolHandler() {
   // Stop() must be called prior to this being called
   DCHECK(server_.get() == NULL);
@@ skipping 163 matching lines @@
   AcceptWebSocket(socket, request);
 }
 
 void DevToolsHttpProtocolHandler::OnWebSocketMessageUI(
     HttpListenSocket* socket,
     const std::string& data) {
   SocketToClientHostMap::iterator it = socket_to_client_host_ui_.find(socket);
   if (it == socket_to_client_host_ui_.end())
     return;
 
-  // TODO(pfeldman): Replace with proper parsing / dispatching.
-  DevToolsMessageData message_data;
-  message_data.class_name = "ToolsAgent";
-  message_data.method_name = "dispatchOnInspectorController";
-  message_data.arguments.push_back(data);
-
   DevToolsManager* manager = DevToolsManager::GetInstance();
   manager->ForwardToDevToolsAgent(it->second,
-      DevToolsAgentMsg_RpcMessage(DevToolsMessageData(message_data)));
+      DevToolsAgentMsg_DispatchOnInspectorBackend(data));
 }
 
 void DevToolsHttpProtocolHandler::OnCloseUI(HttpListenSocket* socket) {
   SocketToClientHostMap::iterator it = socket_to_client_host_ui_.find(socket);
   if (it == socket_to_client_host_ui_.end())
     return;
   DevToolsClientHostImpl* client_host =
       static_cast<DevToolsClientHostImpl*>(it->second);
   client_host->NotifyCloseListener();
   delete client_host;
@@ skipping 138 matching lines @@
     TabStripModel* model = (*it)->tabstrip_model();
     for (int i = 0, size = model->count(); i < size; ++i) {
       NavigationController& controller =
           model->GetTabContentsAt(i)->controller();
       if (controller.session_id().id() == session_id)
         return controller.tab_contents();
     }
   }
   return NULL;
 }