Revert 276939 "Decouple IPC::MessageFilter from IPC::Channel"

components/tracing/child_trace_message_filter.cc

Index: components/tracing/child_trace_message_filter.cc
===================================================================
--- components/tracing/child_trace_message_filter.cc	(revision 278168)
+++ components/tracing/child_trace_message_filter.cc	(working copy)
@@ -15,16 +15,16 @@
 
 ChildTraceMessageFilter::ChildTraceMessageFilter(
     base::MessageLoopProxy* ipc_message_loop)
-    : sender_(NULL),
+    : channel_(NULL),
       ipc_message_loop_(ipc_message_loop) {}
 
-void ChildTraceMessageFilter::OnFilterAdded(IPC::Sender* sender) {
-  sender_ = sender;
-  sender_->Send(new TracingHostMsg_ChildSupportsTracing());
+void ChildTraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
+  channel_ = channel;
+  channel_->Send(new TracingHostMsg_ChildSupportsTracing());
 }
 
 void ChildTraceMessageFilter::OnFilterRemoved() {
-  sender_ = NULL;
+  channel_ = NULL;
 }
 
 bool ChildTraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
@@ -105,7 +105,7 @@
 void ChildTraceMessageFilter::OnGetTraceBufferPercentFull() {
   float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
 
-  sender_->Send(new TracingHostMsg_TraceBufferPercentFullReply(bpf));
+  channel_->Send(new TracingHostMsg_TraceBufferPercentFullReply(bpf));
 }
 
 void ChildTraceMessageFilter::OnSetWatchEvent(const std::string& category_name,
@@ -125,7 +125,7 @@
         base::Bind(&ChildTraceMessageFilter::OnWatchEventMatched, this));
     return;
   }
-  sender_->Send(new TracingHostMsg_WatchEventMatched);
+  channel_->Send(new TracingHostMsg_WatchEventMatched);
 }
 
 void ChildTraceMessageFilter::OnTraceDataCollected(
@@ -138,13 +138,13 @@
     return;
   }
   if (events_str_ptr->data().size()) {
-    sender_->Send(new TracingHostMsg_TraceDataCollected(
+    channel_->Send(new TracingHostMsg_TraceDataCollected(
         events_str_ptr->data()));
   }
   if (!has_more_events) {
     std::vector<std::string> category_groups;
     TraceLog::GetInstance()->GetKnownCategoryGroups(&category_groups);
-    sender_->Send(new TracingHostMsg_EndTracingAck(category_groups));
+    channel_->Send(new TracingHostMsg_EndTracingAck(category_groups));
   }
 }
 
@@ -160,11 +160,11 @@
                    has_more_events));
     return;
   }
-  sender_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
+  channel_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
       events_str_ptr->data()));
 
   if (!has_more_events)
-    sender_->Send(new TracingHostMsg_CaptureMonitoringSnapshotAck());
+    channel_->Send(new TracingHostMsg_CaptureMonitoringSnapshotAck());
 }
 
 }  // namespace tracing