Add tracing support to NaCl

content/common/child_trace_message_filter.cc

Index: content/common/child_trace_message_filter.cc
diff --git a/content/common/child_trace_message_filter.cc b/content/common/child_trace_message_filter.cc
index d3f434121577590c754c7100286477604784c752..8f80152e026271bcef5d1234e74ab20a54d64fe0 100644
--- a/content/common/child_trace_message_filter.cc
+++ b/content/common/child_trace_message_filter.cc
@@ -8,7 +8,7 @@
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "content/common/child_process.h"
-#include "content/common/child_process_messages.h"
+#include "content/components/tracing/tracing_messages.h"
 
 using base::debug::TraceLog;
 
@@ -20,7 +20,7 @@ void ChildTraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
   channel_ = channel;
   TraceLog::GetInstance()->SetNotificationCallback(
       base::Bind(&ChildTraceMessageFilter::OnTraceNotification, this));
-  channel_->Send(new ChildProcessHostMsg_ChildSupportsTracing());
+  channel_->Send(new TracingHostMsg_ChildSupportsTracing());
 }
 
 void ChildTraceMessageFilter::OnFilterRemoved() {
@@ -31,12 +31,12 @@ void ChildTraceMessageFilter::OnFilterRemoved() {
 bool ChildTraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChildTraceMessageFilter, message)
-    IPC_MESSAGE_HANDLER(ChildProcessMsg_BeginTracing, OnBeginTracing)
-    IPC_MESSAGE_HANDLER(ChildProcessMsg_EndTracing, OnEndTracing)
-    IPC_MESSAGE_HANDLER(ChildProcessMsg_GetTraceBufferPercentFull,
+    IPC_MESSAGE_HANDLER(TracingMsg_BeginTracing, OnBeginTracing)
+    IPC_MESSAGE_HANDLER(TracingMsg_EndTracing, OnEndTracing)
+    IPC_MESSAGE_HANDLER(TracingMsg_GetTraceBufferPercentFull,
                         OnGetTraceBufferPercentFull)
-    IPC_MESSAGE_HANDLER(ChildProcessMsg_SetWatchEvent, OnSetWatchEvent)
-    IPC_MESSAGE_HANDLER(ChildProcessMsg_CancelWatchEvent, OnCancelWatchEvent)
+    IPC_MESSAGE_HANDLER(TracingMsg_SetWatchEvent, OnSetWatchEvent)
+    IPC_MESSAGE_HANDLER(TracingMsg_CancelWatchEvent, OnCancelWatchEvent)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -46,7 +46,8 @@ ChildTraceMessageFilter::~ChildTraceMessageFilter() {}
 
 void ChildTraceMessageFilter::OnBeginTracing(
     const std::vector<std::string>& included_categories,
-    const std::vector<std::string>& excluded_categories) {
+    const std::vector<std::string>& excluded_categories,
+    base::TimeTicks browser_time) {
   TraceLog::GetInstance()->SetEnabled(included_categories,
                                       excluded_categories);
 }
@@ -63,13 +64,13 @@ void ChildTraceMessageFilter::OnEndTracing() {
 
   std::vector<std::string> categories;
   TraceLog::GetInstance()->GetKnownCategories(&categories);
-  channel_->Send(new ChildProcessHostMsg_EndTracingAck(categories));
+  channel_->Send(new TracingHostMsg_EndTracingAck(categories));
 }
 
 void ChildTraceMessageFilter::OnGetTraceBufferPercentFull() {
   float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
 
-  channel_->Send(new ChildProcessHostMsg_TraceBufferPercentFullReply(bpf));
+  channel_->Send(new TracingHostMsg_TraceBufferPercentFullReply(bpf));
 }
 
 void ChildTraceMessageFilter::OnSetWatchEvent(const std::string& category_name,
@@ -91,7 +92,7 @@ void ChildTraceMessageFilter::OnTraceDataCollected(
     return;
   }
 
-  channel_->Send(new ChildProcessHostMsg_TraceDataCollected(
+  channel_->Send(new TracingHostMsg_TraceDataCollected(
       events_str_ptr->data()));
 }
 
@@ -103,7 +104,7 @@ void ChildTraceMessageFilter::OnTraceNotification(int notification) {
     return;
   }
 
-  channel_->Send(new ChildProcessHostMsg_TraceNotification(notification));
+  channel_->Send(new TracingHostMsg_TraceNotification(notification));
 }
 
 }  // namespace content