Revert 227354 "Revert "Implement TracingController::{Enable,Disa..."

The original CL was reverted because it increased the binary size of
nacl-helper/data by 0.45%, but the increase was just 128 bytes.
So I'll reland this CL, supressing the size failure.

> 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

TBR=justinlin@chromium.org

Review URL: https://codereview.chromium.org/26272005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227413 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 2 deletions

diff --git a/components/tracing/tracing_messages.h b/components/tracing/tracing_messages.h
index 9beb7e1..25b45bd 100644
--- a/components/tracing/tracing_messages.h
+++ b/components/tracing/tracing_messages.h
@@ -24,6 +24,18 @@ 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)
 
@@ -38,18 +50,26 @@ IPC_MESSAGE_CONTROL0(TracingMsg_CancelWatchEvent)
 // Notify the browser that this child process supports tracing.
 IPC_MESSAGE_CONTROL0(TracingHostMsg_ChildSupportsTracing)
 
-// Reply from child processes acking ChildProcessMsg_TraceChangeStatus(false).
+// Reply from child processes acking TracingMsg_EndTracing.
 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 trace data back in JSON chunks.
+// Child processes send back trace data 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*/)