Make flow event traces disabled-by-default

Currently all flow events are in the category "toplevel.flow", they originated from "ipc" and "task" categories.

BUG=338427

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

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

4 files changed, 11 insertions, 8 deletions

diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index 193b62c..3a0cf30 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -230,10 +230,10 @@ void ChannelProxy::Context::OnDispatchMessage(const Message& message) {
   Logging* logger = Logging::GetInstance();
   std::string name;
   logger->GetMessageText(message.type(), &name, &message, NULL);
-  TRACE_EVENT1("task", "ChannelProxy::Context::OnDispatchMessage",
+  TRACE_EVENT1("toplevel", "ChannelProxy::Context::OnDispatchMessage",
                "name", name);
 #else
-  TRACE_EVENT2("task", "ChannelProxy::Context::OnDispatchMessage",
+  TRACE_EVENT2("toplevel", "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 2ee7449..8b638a9 100644
--- a/ipc/ipc_channel_reader.cc
+++ b/ipc/ipc_channel_reader.cc
@@ -83,9 +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("ipc", "ChannelReader::DispatchInputData", "name", name);
+      TRACE_EVENT1("toplevel", "ChannelReader::DispatchInputData",
+                   "name", name);
 #else
-      TRACE_EVENT2("ipc", "ChannelReader::DispatchInputData",
+      TRACE_EVENT2("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 4209016..17cbd24 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -217,11 +217,13 @@ class IPC_EXPORT Message : public Pickle {
 
   // Called to trace when message is sent.
   void TraceMessageBegin() {
-    TRACE_EVENT_FLOW_BEGIN0("ipc", "IPC", header()->flags);
+    TRACE_EVENT_FLOW_BEGIN0(TRACE_DISABLED_BY_DEFAULT("toplevel.flow"), "IPC",
+        header()->flags);
   }
   // Called to trace when message is received.
   void TraceMessageEnd() {
-    TRACE_EVENT_FLOW_END0("ipc", "IPC", header()->flags);
+    TRACE_EVENT_FLOW_END0(TRACE_DISABLED_BY_DEFAULT("toplevel.flow"), "IPC",
+        header()->flags);
   }
 
  protected:
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
index 491b72d..4b706e2 100644
--- a/ipc/ipc_sync_channel.cc
+++ b/ipc/ipc_sync_channel.cc
@@ -442,10 +442,10 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) {
   Logging* logger = Logging::GetInstance();
   std::string name;
   logger->GetMessageText(message->type(), &name, message, NULL);
-  TRACE_EVENT1("task", "SyncChannel::SendWithTimeout",
+  TRACE_EVENT1("toplevel", "SyncChannel::SendWithTimeout",
                "name", name);
 #else
-  TRACE_EVENT2("task", "SyncChannel::SendWithTimeout",
+  TRACE_EVENT2("toplevel", "SyncChannel::SendWithTimeout",
                "class", IPC_MESSAGE_ID_CLASS(message->type()),
                "line", IPC_MESSAGE_ID_LINE(message->type()));
 #endif