Revert 242671 "Implement sampling profiler (chromium side change)"

trunk/src/content/browser/tracing/tracing_controller_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/tracing/tracing_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/json/string_escape.h"
@@ skipping 62 matching lines @@
     LOG(ERROR) << "Failed to open " << path_.value();
     return;
   }
   const char* preamble = "{\"traceEvents\": [";
   size_t written = fwrite(preamble, strlen(preamble), 1, file_);
   DCHECK(written == 1);
 }
 
 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
   // before the next batch of results.
   if (has_at_least_one_result_) {
     size_t written = fwrite(",", 1, 1, file_);
     DCHECK(written == 1);
   }
   has_at_least_one_result_ = true;
   size_t written = fwrite(events_str_ptr->data().c_str(),
@@ skipping 72 matching lines @@
 
   TraceLog::Options trace_options = (options & RECORD_CONTINUOUSLY) ?
       TraceLog::RECORD_CONTINUOUSLY : TraceLog::RECORD_UNTIL_FULL;
   if (options & ENABLE_SAMPLING) {
     trace_options = static_cast<TraceLog::Options>(
         trace_options | TraceLog::ENABLE_SAMPLING);
   }
   // 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.
   for (TraceMessageFilterMap::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
     it->get()->SendBeginTracing(category_filter, trace_options);
   }
 
   if (!callback.is_null())
     callback.Run();
@@ skipping 53 matching lines @@
   if (!can_enable_monitoring())
     return false;
   is_monitoring_ = true;
 
 #if defined(OS_ANDROID)
   TraceLog::GetInstance()->AddClockSyncMetadataEvent();
 #endif
 
   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.
   for (TraceMessageFilterMap::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
     it->get()->SendEnableMonitoring(category_filter,
         static_cast<TraceLog::Options>(monitoring_tracing_options));
   }
 
   if (!callback.is_null())
@@ skipping 154 matching lines @@
   trace_message_filters_.insert(trace_message_filter);
   if (can_cancel_watch_event()) {
     trace_message_filter->SendSetWatchEvent(watch_category_name_,
                                             watch_event_name_);
   }
   if (can_disable_recording()) {
     trace_message_filter->SendBeginTracing(
         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(
     TraceMessageFilter* trace_message_filter) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TracingControllerImpl::RemoveTraceMessageFilter,
                    base::Unretained(this),
                    make_scoped_refptr(trace_message_filter)));
     return;
@@ skipping 197 matching lines @@
         base::Bind(&TracingControllerImpl::OnWatchEventMatched,
                    base::Unretained(this)));
     return;
   }
 
   if (!watch_event_callback_.is_null())
     watch_event_callback_.Run();
 }
 
 }  // namespace content