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/child_trace_message_filter.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/child_trace_message_filter.h')
-rw-r--r-- | components/tracing/child_trace_message_filter.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/components/tracing/child_trace_message_filter.h b/components/tracing/child_trace_message_filter.h index cbd300f..9f10b4a 100644 --- a/components/tracing/child_trace_message_filter.h +++ b/components/tracing/child_trace_message_filter.h @@ -32,13 +32,8 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter { // Message handlers. void OnBeginTracing(const std::string& category_filter_str, base::TimeTicks browser_time, - int options); + int mode); void OnEndTracing(); - void OnEnableMonitoring(const std::string& category_filter_str, - base::TimeTicks browser_time, - int options); - void OnDisableMonitoring(); - void OnCaptureMonitoringSnapshot(); void OnGetTraceBufferPercentFull(); void OnSetWatchEvent(const std::string& category_name, const std::string& event_name); @@ -48,11 +43,6 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter { void OnTraceDataCollected( const scoped_refptr<base::RefCountedString>& events_str_ptr, bool has_more_events); - - void OnMonitoringTraceDataCollected( - const scoped_refptr<base::RefCountedString>& events_str_ptr, - bool has_more_events); - void OnTraceNotification(int notification); IPC::Channel* channel_; |