Revert of Revert of Revert "Revert 237280 "Remove TraceController""

content/browser/tracing/trace_message_filter.cc

Index: content/browser/tracing/trace_message_filter.cc
diff --git a/content/browser/tracing/trace_message_filter.cc b/content/browser/tracing/trace_message_filter.cc
index 00fffb9900e2922711c794eda9e237a15a91ab9c..35f23dc10259574e808be9a775d36b74b0e72a7d 100644
--- a/content/browser/tracing/trace_message_filter.cc
+++ b/content/browser/tracing/trace_message_filter.cc
@@ -5,7 +5,6 @@
 #include "content/browser/tracing/trace_message_filter.h"
 
 #include "components/tracing/tracing_messages.h"
-#include "content/browser/tracing/trace_controller_impl.h"
 #include "content/browser/tracing/tracing_controller_impl.h"
 
 namespace content {
@@ -17,6 +16,8 @@ TraceMessageFilter::TraceMessageFilter() :
     is_awaiting_buffer_percent_full_ack_(false) {
 }
 
+TraceMessageFilter::~TraceMessageFilter() {}
+
 void TraceMessageFilter::OnChannelClosing() {
   if (has_child_) {
     if (is_awaiting_end_ack_)
@@ -28,8 +29,7 @@ void TraceMessageFilter::OnChannelClosing() {
     if (is_awaiting_buffer_percent_full_ack_)
       OnTraceBufferPercentFullReply(0.0f);
 
-    TraceControllerImpl::GetInstance()->RemoveFilter(this);
-    TracingControllerImpl::GetInstance()->RemoveFilter(this);
+    TracingControllerImpl::GetInstance()->RemoveTraceMessageFilter(this);
   }
 }
 
@@ -47,8 +47,8 @@ bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message,
                         OnTraceDataCollected)
     IPC_MESSAGE_HANDLER(TracingHostMsg_MonitoringTraceDataCollected,
                         OnMonitoringTraceDataCollected)
-    IPC_MESSAGE_HANDLER(TracingHostMsg_TraceNotification,
-                        OnTraceNotification)
+    IPC_MESSAGE_HANDLER(TracingHostMsg_WatchEventMatched,
+                        OnWatchEventMatched)
     IPC_MESSAGE_HANDLER(TracingHostMsg_TraceBufferPercentFullReply,
                         OnTraceBufferPercentFullReply)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -109,12 +109,9 @@ void TraceMessageFilter::SendCancelWatchEvent() {
   Send(new TracingMsg_CancelWatchEvent);
 }
 
-TraceMessageFilter::~TraceMessageFilter() {}
-
 void TraceMessageFilter::OnChildSupportsTracing() {
   has_child_ = true;
-  TraceControllerImpl::GetInstance()->AddFilter(this);
-  TracingControllerImpl::GetInstance()->AddFilter(this);
+  TracingControllerImpl::GetInstance()->AddTraceMessageFilter(this);
 }
 
 void TraceMessageFilter::OnEndTracingAck(
@@ -123,7 +120,6 @@ void TraceMessageFilter::OnEndTracingAck(
   // child process is compromised.
   if (is_awaiting_end_ack_) {
     is_awaiting_end_ack_ = false;
-    TraceControllerImpl::GetInstance()->OnEndTracingAck(known_categories);
     TracingControllerImpl::GetInstance()->OnDisableRecordingAcked(
         known_categories);
   } else {
@@ -145,7 +141,6 @@ void TraceMessageFilter::OnCaptureMonitoringSnapshotAcked() {
 void TraceMessageFilter::OnTraceDataCollected(const std::string& data) {
   scoped_refptr<base::RefCountedString> data_ptr(new base::RefCountedString());
   data_ptr->data() = data;
-  TraceControllerImpl::GetInstance()->OnTraceDataCollected(data_ptr);
   TracingControllerImpl::GetInstance()->OnTraceDataCollected(data_ptr);
 }
 
@@ -157,15 +152,13 @@ void TraceMessageFilter::OnMonitoringTraceDataCollected(
       data_ptr);
 }
 
-void TraceMessageFilter::OnTraceNotification(int notification) {
-  TraceControllerImpl::GetInstance()->OnTraceNotification(notification);
+void TraceMessageFilter::OnWatchEventMatched() {
+  TracingControllerImpl::GetInstance()->OnWatchEventMatched();
 }
 
 void TraceMessageFilter::OnTraceBufferPercentFullReply(float percent_full) {
   if (is_awaiting_buffer_percent_full_ack_) {
     is_awaiting_buffer_percent_full_ack_ = false;
-    TraceControllerImpl::GetInstance()->OnTraceBufferPercentFullReply(
-        percent_full);
     TracingControllerImpl::GetInstance()->OnTraceBufferPercentFullReply(
         percent_full);
   } else {