IPC: Restrict 'toplevel' to truly toplevel events.

These traces shouldn't ever be top level:
- "SyncChannel::SendWithTimeout"
- "ChannelProxy::Context::OnDispatchMessage"

One is sending an IPC (contained within RunTask), and one is
recieving an IPC that was forwarded (also contained within
RunTask).

This brings back the 'ipc' label for all ipc related
events, and just adds 'toplevel' to the one IPC trace that
is actually toplevel, "ChannelReader::DispatchInputData".

BUG=None.

Review URL: https://codereview.chromium.org/237113006

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

4 files changed, 8 insertions, 8 deletions

diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index 7c96c83..5c4d743 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -243,10 +243,10 @@ void ChannelProxy::Context::OnDispatchMessage(const Message& message) {
   Logging* logger = Logging::GetInstance();
   std::string name;
   logger->GetMessageText(message.type(), &name, &message, NULL);
-  TRACE_EVENT1("toplevel", "ChannelProxy::Context::OnDispatchMessage",
+  TRACE_EVENT1("ipc", "ChannelProxy::Context::OnDispatchMessage",
                "name", name);
 #else
-  TRACE_EVENT2("toplevel", "ChannelProxy::Context::OnDispatchMessage",
+  TRACE_EVENT2("ipc", "ChannelProxy::Context::OnDispatchMessage",
                "class", IPC_MESSAGE_ID_CLASS(message.type()),
                "line", IPC_MESSAGE_ID_LINE(message.type()));
 #endif
diff --git a/ipc/ipc_channel_reader.cc b/ipc/ipc_channel_reader.cc
index 8b638a9..401e4e1 100644
--- a/ipc/ipc_channel_reader.cc
+++ b/ipc/ipc_channel_reader.cc
@@ -83,10 +83,10 @@ bool ChannelReader::DispatchInputData(const char* input_data,
       Logging* logger = Logging::GetInstance();
       std::string name;
       logger->GetMessageText(m.type(), &name, &m, NULL);
-      TRACE_EVENT1("toplevel", "ChannelReader::DispatchInputData",
+      TRACE_EVENT1("ipc,toplevel", "ChannelReader::DispatchInputData",
                    "name", name);
 #else
-      TRACE_EVENT2("toplevel", "ChannelReader::DispatchInputData",
+      TRACE_EVENT2("ipc,toplevel", "ChannelReader::DispatchInputData",
                    "class", IPC_MESSAGE_ID_CLASS(m.type()),
                    "line", IPC_MESSAGE_ID_LINE(m.type()));
 #endif
diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index 17cbd24..1b13d67 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -217,12 +217,12 @@ class IPC_EXPORT Message : public Pickle {
 
   // Called to trace when message is sent.
   void TraceMessageBegin() {
-    TRACE_EVENT_FLOW_BEGIN0(TRACE_DISABLED_BY_DEFAULT("toplevel.flow"), "IPC",
+    TRACE_EVENT_FLOW_BEGIN0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"), "IPC",
         header()->flags);
   }
   // Called to trace when message is received.
   void TraceMessageEnd() {
-    TRACE_EVENT_FLOW_END0(TRACE_DISABLED_BY_DEFAULT("toplevel.flow"), "IPC",
+    TRACE_EVENT_FLOW_END0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"), "IPC",
         header()->flags);
   }
 
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
index 9e04f61..0e0018c 100644
--- a/ipc/ipc_sync_channel.cc
+++ b/ipc/ipc_sync_channel.cc
@@ -442,9 +442,9 @@ bool SyncChannel::Send(Message* message) {
   Logging* logger = Logging::GetInstance();
   std::string name;
   logger->GetMessageText(message->type(), &name, message, NULL);
-  TRACE_EVENT1("toplevel", "SyncChannel::Send", "name", name);
+  TRACE_EVENT1("ipc", "SyncChannel::Send", "name", name);
 #else
-  TRACE_EVENT2("toplevel", "SyncChannel::Send",
+  TRACE_EVENT2("ipc", "SyncChannel::Send",
                "class", IPC_MESSAGE_ID_CLASS(message->type()),
                "line", IPC_MESSAGE_ID_LINE(message->type()));
 #endif