Migrate IPC to use Flow API v2.

BUG=https://github.com/catapult-project/catapult/issues/1079

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

Cr-Commit-Position: refs/heads/master@{#344053}

6 files changed, 31 insertions, 22 deletions

diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc
index 37ba92f..2e5f8b3 100644
--- a/ipc/ipc_channel_nacl.cc
+++ b/ipc/ipc_channel_nacl.cc
@@ -211,7 +211,10 @@ bool ChannelNacl::Send(Message* message) {
   Logging::GetInstance()->OnSendMessage(message_ptr.get(), "");
 #endif  // IPC_MESSAGE_LOG_ENABLED
 
-  message->TraceMessageBegin();
+  TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
+                         "ChannelNacl::Send",
+                         message->header()->flags,
+                         TRACE_EVENT_FLAG_FLOW_OUT);
   output_queue_.push_back(linked_ptr<Message>(message_ptr.release()));
   if (!waiting_connect_)
     return ProcessOutgoingMessages();
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index 4a3eb9d..b5e2332 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -511,7 +511,10 @@ bool ChannelPosix::Send(Message* message) {
   Logging::GetInstance()->OnSendMessage(message, "");
 #endif  // IPC_MESSAGE_LOG_ENABLED
 
-  message->TraceMessageBegin();
+  TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
+                         "ChannelPosix::Send",
+                         message->flags(),
+                         TRACE_EVENT_FLAG_FLOW_OUT);
   output_queue_.push(message);
   if (!is_blocked_on_write_ && !waiting_connect_) {
     return ProcessOutgoingMessages();
diff --git a/ipc/ipc_channel_reader.cc b/ipc/ipc_channel_reader.cc
index 30f03a1..a76b7e6 100644
--- a/ipc/ipc_channel_reader.cc
+++ b/ipc/ipc_channel_reader.cc
@@ -155,14 +155,19 @@ void ChannelReader::DispatchMessage(Message* m) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   std::string name;
   Logging::GetInstance()->GetMessageText(m->type(), &name, m, NULL);
-  TRACE_EVENT1("ipc,toplevel", "ChannelReader::DispatchInputData", "name",
-               name);
+  TRACE_EVENT_WITH_FLOW1("ipc,toplevel",
+                         "ChannelReader::DispatchInputData",
+                         m->flags(),
+                         TRACE_EVENT_FLAG_FLOW_IN,
+                         "name", name);
 #else
-  TRACE_EVENT2("ipc,toplevel", "ChannelReader::DispatchInputData", "class",
-               IPC_MESSAGE_ID_CLASS(m->type()), "line",
-               IPC_MESSAGE_ID_LINE(m->type()));
+  TRACE_EVENT_WITH_FLOW2("ipc,toplevel",
+                         "ChannelReader::DispatchInputData",
+                         m->flags(),
+                         TRACE_EVENT_FLAG_FLOW_IN,
+                         "class", IPC_MESSAGE_ID_CLASS(m->type()),
+                         "line", IPC_MESSAGE_ID_LINE(m->type()));
 #endif
-  m->TraceMessageEnd();
 
   bool handled = false;
   if (IsInternalMessage(*m)) {
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc
index 1442f7f..ad7ffb5 100644
--- a/ipc/ipc_channel_win.cc
+++ b/ipc/ipc_channel_win.cc
@@ -120,7 +120,10 @@ bool ChannelWin::ProcessMessageForDelivery(Message* message) {
   Logging::GetInstance()->OnSendMessage(message, "");
 #endif
 
-  message->TraceMessageBegin();
+  TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
+                         "ChannelWin::ProcessMessageForDelivery",
+                         message->flags(),
+                         TRACE_EVENT_FLAG_FLOW_OUT);
 
   // |output_queue_| takes ownership of |message|.
   output_queue_.push(message);
diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index 73a5165..d12f6a3 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -207,17 +207,6 @@ class IPC_EXPORT Message : public base::Pickle {
   bool dont_log() const { return dont_log_; }
 #endif
 
-  // Called to trace when message is sent.
-  void TraceMessageBegin() {
-    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_END_BIND_TO_ENCLOSING0(
-        TRACE_DISABLED_BY_DEFAULT("ipc.flow"), "IPC", header()->flags);
-  }
-
  protected:
   friend class Channel;
   friend class ChannelMojo;
diff --git a/ipc/mojo/ipc_message_pipe_reader.cc b/ipc/mojo/ipc_message_pipe_reader.cc
index 44bd10a..2202a57 100644
--- a/ipc/mojo/ipc_message_pipe_reader.cc
+++ b/ipc/mojo/ipc_message_pipe_reader.cc
@@ -61,7 +61,10 @@ void MessagePipeReader::CloseWithErrorLater(MojoResult error) {
 bool MessagePipeReader::Send(scoped_ptr<Message> message) {
   DCHECK(IsValid());
 
-  message->TraceMessageBegin();
+  TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
+                         "MessagePipeReader::Send",
+                         message->flags(),
+                         TRACE_EVENT_FLAG_FLOW_OUT);
   std::vector<MojoHandle> handles;
   MojoResult result = MOJO_RESULT_OK;
   result = ChannelMojo::ReadFromMessageAttachmentSet(message.get(), &handles);
@@ -100,7 +103,10 @@ void MessagePipeReader::OnMessageReceived() {
     return;
   }
 
-  message.TraceMessageEnd();
+  TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
+                         "MessagePipeReader::OnMessageReceived",
+                         message.flags(),
+                         TRACE_EVENT_FLAG_FLOW_IN);
   delegate_->OnMessageReceived(message);
 }