| Index: trunk/src/content/browser/tracing/tracing_controller_impl.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/tracing/tracing_controller_impl.cc (revision 242678)
|
| +++ trunk/src/content/browser/tracing/tracing_controller_impl.cc (working copy)
|
| @@ -80,7 +80,7 @@
|
|
|
| void TracingControllerImpl::ResultFile::WriteTask(
|
| const scoped_refptr<base::RefCountedString>& events_str_ptr) {
|
| - if (!file_ || !events_str_ptr->data().size())
|
| + if (!file_)
|
| return;
|
|
|
| // If there is already a result in the file, then put a commma
|
| @@ -173,9 +173,7 @@
|
| // TODO(haraken): How to handle ENABLE_SYSTRACE?
|
|
|
| TraceLog::GetInstance()->SetEnabled(
|
| - base::debug::CategoryFilter(category_filter),
|
| - base::debug::TraceLog::RECORDING_MODE,
|
| - trace_options);
|
| + base::debug::CategoryFilter(category_filter), trace_options);
|
| is_recording_ = true;
|
|
|
| // Notify all child processes.
|
| @@ -249,11 +247,10 @@
|
|
|
| int monitoring_tracing_options = 0;
|
| if (options & ENABLE_SAMPLING)
|
| - monitoring_tracing_options |= base::debug::TraceLog::ENABLE_SAMPLING;
|
| + monitoring_tracing_options |= base::debug::TraceLog::MONITOR_SAMPLING;
|
|
|
| TraceLog::GetInstance()->SetEnabled(
|
| base::debug::CategoryFilter(category_filter),
|
| - base::debug::TraceLog::MONITORING_MODE,
|
| static_cast<TraceLog::Options>(monitoring_tracing_options));
|
|
|
| // Notify all child processes.
|
| @@ -428,11 +425,6 @@
|
| TraceLog::GetInstance()->GetCurrentCategoryFilter().ToString(),
|
| TraceLog::GetInstance()->trace_options());
|
| }
|
| - if (can_disable_monitoring()) {
|
| - trace_message_filter->SendEnableMonitoring(
|
| - TraceLog::GetInstance()->GetCurrentCategoryFilter().ToString(),
|
| - TraceLog::GetInstance()->trace_options());
|
| - }
|
| }
|
|
|
| void TracingControllerImpl::RemoveTraceMessageFilter(
|
|
|