diff options
author | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 22:13:39 +0000 |
---|---|---|
committer | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 22:13:39 +0000 |
commit | e025fcba0b95c2ec05519e2104c884c3514abb26 (patch) | |
tree | e491634db2ba58b9574c32fe86bd459ddfb4fa77 /components/tracing/tracing_messages.h | |
parent | 879e7211afa8e1505cc75ce264a6c64da0cab1d9 (diff) | |
download | chromium_src-e025fcba0b95c2ec05519e2104c884c3514abb26.zip chromium_src-e025fcba0b95c2ec05519e2104c884c3514abb26.tar.gz chromium_src-e025fcba0b95c2ec05519e2104c884c3514abb26.tar.bz2 |
Revert "Implement TracingController::{Enable,Disable,Capture}Monitoring"
Revert "Fix failures in chrome os after r227262"
Revert "Fix the content_browser breakage after r227269"
Caused sizes regression on linux for nacl-helper-data.
TBR=haraken
BUG=304789
> 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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=226701
>
> R=dsinclair@chromium.org, joi@chromium.org, nduca@chromium.org, tsepez@chromium.org
>
> Review URL: https://codereview.chromium.org/23531042
Review URL: https://codereview.chromium.org/26294003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/tracing/tracing_messages.h')
-rw-r--r-- | components/tracing/tracing_messages.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/components/tracing/tracing_messages.h b/components/tracing/tracing_messages.h index 25b45bd..9beb7e1 100644 --- a/components/tracing/tracing_messages.h +++ b/components/tracing/tracing_messages.h @@ -24,18 +24,6 @@ IPC_MESSAGE_CONTROL3(TracingMsg_BeginTracing, // Sent to all child processes to disable trace event recording. IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing) -// Sent to all child processes to start monitoring. -IPC_MESSAGE_CONTROL3(TracingMsg_EnableMonitoring, - std::string /* category_filter_str */, - base::TimeTicks /* browser_time */, - int /* base::debug::TraceLog::Options */) - -// Sent to all child processes to stop monitoring.. -IPC_MESSAGE_CONTROL0(TracingMsg_DisableMonitoring) - -// Sent to all child processes to capture the current monitorint snapshot. -IPC_MESSAGE_CONTROL0(TracingMsg_CaptureMonitoringSnapshot) - // Sent to all child processes to get trace buffer fullness. IPC_MESSAGE_CONTROL0(TracingMsg_GetTraceBufferPercentFull) @@ -50,26 +38,18 @@ IPC_MESSAGE_CONTROL0(TracingMsg_CancelWatchEvent) // Notify the browser that this child process supports tracing. IPC_MESSAGE_CONTROL0(TracingHostMsg_ChildSupportsTracing) -// Reply from child processes acking TracingMsg_EndTracing. +// Reply from child processes acking ChildProcessMsg_TraceChangeStatus(false). IPC_MESSAGE_CONTROL1(TracingHostMsg_EndTracingAck, std::vector<std::string> /* known_categories */) -// Reply from child processes acking TracingMsg_CaptureMonitoringSnapshot. -IPC_MESSAGE_CONTROL0(TracingHostMsg_CaptureMonitoringSnapshotAck) - // Sent if the trace buffer becomes full. IPC_MESSAGE_CONTROL1(TracingHostMsg_TraceNotification, int /* base::debug::TraceLog::Notification */) -// Child processes send back trace data in JSON chunks. +// Child processes send trace data back in JSON chunks. IPC_MESSAGE_CONTROL1(TracingHostMsg_TraceDataCollected, std::string /*json trace data*/) -// Child processes send back trace data of the current monitoring -// in JSON chunks. -IPC_MESSAGE_CONTROL1(TracingHostMsg_MonitoringTraceDataCollected, - std::string /*json trace data*/) - // Reply to TracingMsg_GetTraceBufferPercentFull. IPC_MESSAGE_CONTROL1(TracingHostMsg_TraceBufferPercentFullReply, float /*trace buffer percent full*/) |