Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack.

components/tracing/child_trace_message_filter.cc

 // Copyright (c) 2012 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 "components/tracing/child_trace_message_filter.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "components/tracing/tracing_messages.h"
 #include "ipc/ipc_channel.h"
@@ skipping 32 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 ChildTraceMessageFilter::~ChildTraceMessageFilter() {}
 
 void ChildTraceMessageFilter::OnBeginTracing(
     const std::string& category_filter_str,
     base::TimeTicks browser_time,
-    int options) {
+    const std::string& options) {
 #if defined(__native_client__)
   // NaCl and system times are offset by a bit, so subtract some time from
   // the captured timestamps. The value might be off by a bit due to messaging
   // latency.
   base::TimeDelta time_offset = base::TimeTicks::NowFromSystemTraceTime() -
       browser_time;
   TraceLog::GetInstance()->SetTimeOffset(time_offset);
 #endif
 
   TraceLog::GetInstance()->SetEnabled(
       base::debug::CategoryFilter(category_filter_str),
       base::debug::TraceLog::RECORDING_MODE,
-      static_cast<base::debug::TraceLog::Options>(options));
+      base::debug::TraceOptions(options));
 }
 
 void ChildTraceMessageFilter::OnEndTracing() {
   TraceLog::GetInstance()->SetDisabled();
 
   // Flush will generate one or more callbacks to OnTraceDataCollected
   // synchronously or asynchronously. EndTracingAck will be sent in the last
   // OnTraceDataCollected. We are already on the IO thread, so the
   // OnTraceDataCollected calls will not be deferred.
   TraceLog::GetInstance()->Flush(
       base::Bind(&ChildTraceMessageFilter::OnTraceDataCollected, this));
 }
 
 void ChildTraceMessageFilter::OnEnableMonitoring(
     const std::string& category_filter_str,
     base::TimeTicks browser_time,
-    int options) {
+    const std::string& options) {
   TraceLog::GetInstance()->SetEnabled(
       base::debug::CategoryFilter(category_filter_str),
       base::debug::TraceLog::MONITORING_MODE,
-      static_cast<base::debug::TraceLog::Options>(options));
+      base::debug::TraceOptions(options));
 }
 
 void ChildTraceMessageFilter::OnDisableMonitoring() {
   TraceLog::GetInstance()->SetDisabled();
 }
 
 void ChildTraceMessageFilter::OnCaptureMonitoringSnapshot() {
   // Flush will generate one or more callbacks to
   // OnMonitoringTraceDataCollected. It's important that the last
   // OnMonitoringTraceDataCollected gets called before
@@ skipping 63 matching lines @@
     return;
   }
   sender_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
       events_str_ptr->data()));
 
   if (!has_more_events)
     sender_->Send(new TracingHostMsg_CaptureMonitoringSnapshotAck());
 }
 
 }  // namespace tracing