summaryrefslogtreecommitdiffstats
path: root/components/tracing/child_trace_message_filter.cc
diff options
context:
space:
mode:
authortapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-03 08:31:02 +0000
committertapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-03 08:31:02 +0000
commit8aa7a01325662609d163298749a2be47a34f1fc0 (patch)
tree0116fdbb1def76c9290201b87ecfa6f00465c95d /components/tracing/child_trace_message_filter.cc
parent3475bb58d996f69716b89f592406ee9e1923114f (diff)
downloadchromium_src-8aa7a01325662609d163298749a2be47a34f1fc0.zip
chromium_src-8aa7a01325662609d163298749a2be47a34f1fc0.tar.gz
chromium_src-8aa7a01325662609d163298749a2be47a34f1fc0.tar.bz2
Revert 226701 "Implement TracingController::{Enable,Disable,Capt..."
Added test base_unittests:TraceContinuousSampling fails on main waterfall http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Clang%20%28dbg%29&number=51008 TraceEventTestFixture.TraceContinuousSampling: ../../base/debug/trace_event_unittest.cc:1814: Failure Value of: FindNamePhase("CCC", "P") Actual: false Expected: true > Implement TracingController::{Enable,Disable,Capture}Monitoring > > This CL implements TracingController::EnableMonitoring, > TracingController::DisableMonitoring and > TracingController::CaptureMonitoringSnapshot. > > BUG=241743 > TEST=base_unittests::TraceEventTestFixture.TraceContinuousSampling, > content_browsertests::TracingControllerTest.EnableCaptureAndDisableMonitoring > > Review URL: https://codereview.chromium.org/23531042 TBR=haraken@chromium.org Review URL: https://codereview.chromium.org/25849002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/tracing/child_trace_message_filter.cc')
-rw-r--r--components/tracing/child_trace_message_filter.cc47
1 files changed, 0 insertions, 47 deletions
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
index 9925f3f..8310ec5 100644
--- a/components/tracing/child_trace_message_filter.cc
+++ b/components/tracing/child_trace_message_filter.cc
@@ -34,10 +34,6 @@ bool ChildTraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
IPC_BEGIN_MESSAGE_MAP(ChildTraceMessageFilter, message)
IPC_MESSAGE_HANDLER(TracingMsg_BeginTracing, OnBeginTracing)
IPC_MESSAGE_HANDLER(TracingMsg_EndTracing, OnEndTracing)
- IPC_MESSAGE_HANDLER(TracingMsg_EnableMonitoring, OnEnableMonitoring)
- IPC_MESSAGE_HANDLER(TracingMsg_DisableMonitoring, OnDisableMonitoring)
- IPC_MESSAGE_HANDLER(TracingMsg_CaptureMonitoringSnapshot,
- OnCaptureMonitoringSnapshot)
IPC_MESSAGE_HANDLER(TracingMsg_GetTraceBufferPercentFull,
OnGetTraceBufferPercentFull)
IPC_MESSAGE_HANDLER(TracingMsg_SetWatchEvent, OnSetWatchEvent)
@@ -77,33 +73,6 @@ void ChildTraceMessageFilter::OnEndTracing() {
base::Bind(&ChildTraceMessageFilter::OnTraceDataCollected, this));
}
-void ChildTraceMessageFilter::OnEnableMonitoring(
- const std::string& category_filter_str,
- base::TimeTicks browser_time,
- int options) {
- TraceLog::GetInstance()->SetEnabled(
- base::debug::CategoryFilter(category_filter_str),
- static_cast<base::debug::TraceLog::Options>(options));
-}
-
-void ChildTraceMessageFilter::OnDisableMonitoring() {
- TraceLog::GetInstance()->SetDisabled();
-}
-
-void ChildTraceMessageFilter::OnCaptureMonitoringSnapshot() {
- // Flush will generate one or more callbacks to
- // OnMonitoringTraceDataCollected. It's important that the last
- // OnMonitoringTraceDataCollected gets called before
- // CaptureMonitoringSnapshotAck below. We are already on the IO thread,
- // so the OnMonitoringTraceDataCollected calls will not be deferred.
- TraceLog::GetInstance()->FlushButLeaveBufferIntact(
- base::Bind(&ChildTraceMessageFilter::
- OnMonitoringTraceDataCollected,
- this));
-
- channel_->Send(new TracingHostMsg_CaptureMonitoringSnapshotAck());
-}
-
void ChildTraceMessageFilter::OnGetTraceBufferPercentFull() {
float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
@@ -140,22 +109,6 @@ void ChildTraceMessageFilter::OnTraceDataCollected(
}
}
-void ChildTraceMessageFilter::OnMonitoringTraceDataCollected(
- const scoped_refptr<base::RefCountedString>& events_str_ptr,
- bool has_more_events) {
- if (!ipc_message_loop_->BelongsToCurrentThread()) {
- ipc_message_loop_->PostTask(FROM_HERE,
- base::Bind(&ChildTraceMessageFilter::
- OnMonitoringTraceDataCollected,
- this,
- events_str_ptr,
- has_more_events));
- return;
- }
- channel_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
- events_str_ptr->data()));
-}
-
void ChildTraceMessageFilter::OnTraceNotification(int notification) {
if (!ipc_message_loop_->BelongsToCurrentThread()) {
ipc_message_loop_->PostTask(FROM_HERE,