diff options
author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 08:31:02 +0000 |
---|---|---|
committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 08:31:02 +0000 |
commit | 8aa7a01325662609d163298749a2be47a34f1fc0 (patch) | |
tree | 0116fdbb1def76c9290201b87ecfa6f00465c95d /components/tracing/child_trace_message_filter.h | |
parent | 3475bb58d996f69716b89f592406ee9e1923114f (diff) | |
download | chromium_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.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_; |