DevTools: explicitly define routed messages as routed, not control. All DevTools messages are routed ones but some of them are stoll declared as CONTROL.

BUG=None
TEST=Existing DevTools tests

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

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

9 files changed, 44 insertions, 35 deletions

diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc
index 8c6adc8..c087336 100644
--- a/chrome/browser/extensions/extension_debugger_api.cc
+++ b/chrome/browser/extensions/extension_debugger_api.cc
@@ -126,7 +126,7 @@ ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
       this);
   DevToolsManager::GetInstance()->ForwardToDevToolsAgent(
       this,
-      DevToolsAgentMsg_FrontendLoaded());
+      DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
 }
 
 ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() {
@@ -191,7 +191,8 @@ void ExtensionDevToolsClientHost::SendMessageToBackend(
   base::JSONWriter::Write(&protocol_request, false, &json_args);
   DevToolsManager::GetInstance()->ForwardToDevToolsAgent(
       this,
-      DevToolsAgentMsg_DispatchOnInspectorBackend(json_args));
+      DevToolsAgentMsg_DispatchOnInspectorBackend(MSG_ROUTING_NONE,
+                                                  json_args));
 }
 
 void ExtensionDevToolsClientHost::Observe(
diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index 53da8ce..a6740be 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -68,18 +68,20 @@ bool ExtensionDevToolsBridge::RegisterAsDevToolsClientHost() {
     // 1. Report front-end is loaded.
     devtools_manager->ForwardToDevToolsAgent(
         this,
-        DevToolsAgentMsg_FrontendLoaded());
+        DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
 
     // 2. Start timeline profiler.
     devtools_manager->ForwardToDevToolsAgent(
         this,
         DevToolsAgentMsg_DispatchOnInspectorBackend(
+            MSG_ROUTING_NONE,
             FormatDevToolsMessage(2, "Timeline.start")));
 
     // 3. Enable network resource tracking.
     devtools_manager->ForwardToDevToolsAgent(
         this,
         DevToolsAgentMsg_DispatchOnInspectorBackend(
+            MSG_ROUTING_NONE,
             FormatDevToolsMessage(3, "Network.enable")));
 
     return true;
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc
index 76ed6cd..5b7af92 100644
--- a/chrome/browser/extensions/extension_devtools_browsertests.cc
+++ b/chrome/browser/extensions/extension_devtools_browsertests.cc
@@ -81,7 +81,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, FLAKY_TimelineApi) {
   // Test onPageEvent event.
   result = false;
 
-  DevToolsClientMsg_DispatchOnInspectorFrontend pageEventMessage("");
+  DevToolsClientMsg_DispatchOnInspectorFrontend pageEventMessage(
+      MSG_ROUTING_NONE,
+      "");
   devtools_client_host->SendMessageToClient(pageEventMessage);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testReceivePageEvent()", &result));
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 8b8d623..1487ebd 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -96,13 +96,14 @@ void DevToolsAgent::sendMessageToInspectorFrontend(
     const WebKit::WebString& message) {
   Send(new DevToolsHostMsg_ForwardToClient(
       routing_id(),
-      DevToolsClientMsg_DispatchOnInspectorFrontend(message.utf8())));
+      DevToolsClientMsg_DispatchOnInspectorFrontend(MSG_ROUTING_NONE,
+                                                    message.utf8())));
 }
 
 void DevToolsAgent::sendDebuggerOutput(const WebKit::WebString& data) {
   Send(new DevToolsHostMsg_ForwardToClient(
       routing_id(),
-      DevToolsClientMsg_DebuggerOutput(data.utf8())));
+      DevToolsClientMsg_DebuggerOutput(MSG_ROUTING_NONE, data.utf8())));
 }
 
 int DevToolsAgent::hostIdentifier() {
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index 02882b5..d4b4c53 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -49,15 +49,17 @@ bool DevToolsClient::OnMessageReceived(const IPC::Message& message) {
 }
 
 void DevToolsClient::sendFrontendLoaded() {
-  SendToAgent(DevToolsAgentMsg_FrontendLoaded());
+  SendToAgent(DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
 }
 
 void DevToolsClient::sendMessageToBackend(const WebString& message)  {
-  SendToAgent(DevToolsAgentMsg_DispatchOnInspectorBackend(message.utf8()));
+  SendToAgent(DevToolsAgentMsg_DispatchOnInspectorBackend(MSG_ROUTING_NONE,
+                                                          message.utf8()));
 }
 
 void DevToolsClient::sendDebuggerCommandToAgent(const WebString& command) {
-  SendToAgent(DevToolsAgentMsg_DebuggerCommand(command.utf8()));
+  SendToAgent(DevToolsAgentMsg_DebuggerCommand(MSG_ROUTING_NONE,
+                                               command.utf8()));
 }
 
 void DevToolsClient::activateWindow() {
diff --git a/content/browser/debugger/debugger_remote_service.cc b/content/browser/debugger/debugger_remote_service.cc
index cd5eae5..881c446 100644
--- a/content/browser/debugger/debugger_remote_service.cc
+++ b/content/browser/debugger/debugger_remote_service.cc
@@ -298,7 +298,8 @@ bool DebuggerRemoteService::DispatchDebuggerCommand(int tab_uid,
   content->GetDictionary(kDataKey, &v8_command_value);
   base::JSONWriter::Write(v8_command_value, false, &v8_command);
   manager->ForwardToDevToolsAgent(
-      client_host, DevToolsAgentMsg_DebuggerCommand(v8_command));
+      client_host, DevToolsAgentMsg_DebuggerCommand(MSG_ROUTING_NONE,
+                                                    v8_command));
   // Do not send the response right now, as the JSON will be received from
   // the V8 debugger asynchronously.
   return false;
diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc
index 20a339a..3e78e4b 100644
--- a/content/browser/debugger/devtools_http_protocol_handler.cc
+++ b/content/browser/debugger/devtools_http_protocol_handler.cc
@@ -337,7 +337,7 @@ void DevToolsHttpProtocolHandler::OnWebSocketRequestUI(
       client_host);
   manager->ForwardToDevToolsAgent(
       client_host,
-      DevToolsAgentMsg_FrontendLoaded());
+      DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
 
   AcceptWebSocket(connection_id, request);
 }
@@ -353,7 +353,7 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessageUI(
   DevToolsManager* manager = DevToolsManager::GetInstance();
   manager->ForwardToDevToolsAgent(
       it->second,
-      DevToolsAgentMsg_DispatchOnInspectorBackend(data));
+      DevToolsAgentMsg_DispatchOnInspectorBackend(MSG_ROUTING_NONE, data));
 }
 
 void DevToolsHttpProtocolHandler::OnCloseUI(int connection_id) {
diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc
index e2509e3..7d747eb 100644
--- a/content/browser/debugger/devtools_manager.cc
+++ b/content/browser/debugger/devtools_manager.cc
@@ -115,9 +115,10 @@ void DevToolsManager::RuntimePropertyChanged(RenderViewHost* inspected_rvh,
 void DevToolsManager::SendInspectElement(RenderViewHost* inspected_rvh,
                                          int x,
                                          int y) {
-  IPC::Message* m = new DevToolsAgentMsg_InspectElement(x, y);
-  m->set_routing_id(inspected_rvh->routing_id());
-  inspected_rvh->Send(m);
+  inspected_rvh->Send(new DevToolsAgentMsg_InspectElement(
+      inspected_rvh->routing_id(),
+      x,
+      y));
 }
 
 void DevToolsManager::ClientHostClosing(DevToolsClientHost* host) {
@@ -234,17 +235,16 @@ void DevToolsManager::SendAttachToAgent(RenderViewHost* inspected_rvh) {
       properties = DevToolsRuntimeProperties(it->second.begin(),
                                             it->second.end());
     }
-    IPC::Message* m = new DevToolsAgentMsg_Attach(properties);
-    m->set_routing_id(inspected_rvh->routing_id());
-    inspected_rvh->Send(m);
+    inspected_rvh->Send(new DevToolsAgentMsg_Attach(
+        inspected_rvh->routing_id(),
+        properties));
   }
 }
 
 void DevToolsManager::SendDetachToAgent(RenderViewHost* inspected_rvh) {
   if (inspected_rvh) {
-    IPC::Message* m = new DevToolsAgentMsg_Detach();
-    m->set_routing_id(inspected_rvh->routing_id());
-    inspected_rvh->Send(m);
+    inspected_rvh->Send(new DevToolsAgentMsg_Detach(
+        inspected_rvh->routing_id()));
   }
 }
 
diff --git a/content/common/devtools_messages.h b/content/common/devtools_messages.h
index d0178bc..6c456b6 100644
--- a/content/common/devtools_messages.h
+++ b/content/common/devtools_messages.h
@@ -57,30 +57,30 @@ typedef std::map<std::string, std::string> DevToolsRuntimeProperties;
 // These are messages sent from DevToolsAgent to DevToolsClient through the
 // browser.
 // WebKit-level transport.
-IPC_MESSAGE_CONTROL1(DevToolsClientMsg_DispatchOnInspectorFrontend,
-                     std::string /* message */)
+IPC_MESSAGE_ROUTED1(DevToolsClientMsg_DispatchOnInspectorFrontend,
+                    std::string /* message */)
 
 // Legacy debugger output message.
-IPC_MESSAGE_CONTROL1(DevToolsClientMsg_DebuggerOutput,
-                     std::string /* message */)
+IPC_MESSAGE_ROUTED1(DevToolsClientMsg_DebuggerOutput,
+                    std::string /* message */)
 
 
 //-----------------------------------------------------------------------------
 // These are messages sent from DevToolsClient to DevToolsAgent through the
 // browser.
 // Tells agent that there is a client host connected to it.
-IPC_MESSAGE_CONTROL1(DevToolsAgentMsg_Attach,
-                     DevToolsRuntimeProperties /* properties */)
+IPC_MESSAGE_ROUTED1(DevToolsAgentMsg_Attach,
+                    DevToolsRuntimeProperties /* properties */)
 
 // Tells agent that there is no longer a client host connected to it.
-IPC_MESSAGE_CONTROL0(DevToolsAgentMsg_Detach)
+IPC_MESSAGE_ROUTED0(DevToolsAgentMsg_Detach)
 
 // Tells agent that the front-end has been loaded
-IPC_MESSAGE_CONTROL0(DevToolsAgentMsg_FrontendLoaded)
+IPC_MESSAGE_ROUTED0(DevToolsAgentMsg_FrontendLoaded)
 
 // WebKit-level transport.
-IPC_MESSAGE_CONTROL1(DevToolsAgentMsg_DispatchOnInspectorBackend,
-                     std::string /* message */)
+IPC_MESSAGE_ROUTED1(DevToolsAgentMsg_DispatchOnInspectorBackend,
+                    std::string /* message */)
 
 // WebKit-level transport for messages from WorkerInspectorController to
 // InspectorController.
@@ -91,13 +91,13 @@ IPC_MESSAGE_ROUTED1(DevToolsAgentMsg_DispatchMessageFromWorker,
 // be handled on IO thread(while all other devtools messages are handled in
 // the render thread) to allow executing the commands when v8 is on a
 // breakpoint.
-IPC_MESSAGE_CONTROL1(DevToolsAgentMsg_DebuggerCommand,
+IPC_MESSAGE_ROUTED1(DevToolsAgentMsg_DebuggerCommand,
                      std::string  /* command */)
 
 // Inspect element with the given coordinates.
-IPC_MESSAGE_CONTROL2(DevToolsAgentMsg_InspectElement,
-                     int /* x */,
-                     int /* y */)
+IPC_MESSAGE_ROUTED2(DevToolsAgentMsg_InspectElement,
+                    int /* x */,
+                    int /* y */)
 
 
 //-----------------------------------------------------------------------------