implement SetWatchEvent and WaitForEvent for trace-based-tests

content/browser/trace_message_filter.cc

Index: content/browser/trace_message_filter.cc
diff --git a/content/browser/trace_message_filter.cc b/content/browser/trace_message_filter.cc
index 6d57ecee790a850d0d48d9f2d8f52618a21a099c..dc8c124bbfca553b49819584dd50d730a2b48956 100644
--- a/content/browser/trace_message_filter.cc
+++ b/content/browser/trace_message_filter.cc
@@ -47,8 +47,8 @@ bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message,
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_EndTracingAck, OnEndTracingAck)
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TraceDataCollected,
                         OnTraceDataCollected)
-    IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TraceBufferFull,
-                        OnTraceBufferFull)
+    IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TraceNotification,
+                        OnTraceNotification)
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TraceBufferPercentFullReply,
                         OnTraceBufferPercentFullReply)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -78,6 +78,18 @@ void TraceMessageFilter::SendGetTraceBufferPercentFull() {
   Send(new ChildProcessMsg_GetTraceBufferPercentFull);
 }
 
+void TraceMessageFilter::SendSetWatchEvent(const std::string& category_name,
+                                           const std::string& event_name,
+                                           int num_occurrences) {
+  Send(new ChildProcessMsg_SetWatchEvent(category_name,
+                                         event_name,
+                                         num_occurrences));
+}
+
+void TraceMessageFilter::SendCancelWatchEvent() {
+  Send(new ChildProcessMsg_CancelWatchEvent);
+}
+
 TraceMessageFilter::~TraceMessageFilter() {}
 
 void TraceMessageFilter::OnChildSupportsTracing() {
@@ -103,8 +115,8 @@ void TraceMessageFilter::OnTraceDataCollected(const std::string& data) {
   TraceControllerImpl::GetInstance()->OnTraceDataCollected(data_ptr);
 }
 
-void TraceMessageFilter::OnTraceBufferFull() {
-  TraceControllerImpl::GetInstance()->OnTraceBufferFull();
+void TraceMessageFilter::OnTraceNotification(int notification) {
+  TraceControllerImpl::GetInstance()->OnTraceNotification(notification);
 }
 
 void TraceMessageFilter::OnTraceBufferPercentFullReply(float percent_full) {