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

content/browser/tracing/trace_message_filter.cc

Index: content/browser/tracing/trace_message_filter.cc
diff --git a/content/browser/tracing/trace_message_filter.cc b/content/browser/tracing/trace_message_filter.cc
index ba8ec65de163e7c101589591040152119b622c31..7d02673b099b85a98365e5be87c2e8719e7ff9ee 100644
--- a/content/browser/tracing/trace_message_filter.cc
+++ b/content/browser/tracing/trace_message_filter.cc
@@ -58,11 +58,11 @@ bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
 
 void TraceMessageFilter::SendBeginTracing(
     const std::string& category_filter_str,
-    base::debug::TraceLog::Options options) {
+    base::debug::TraceOptions options) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Send(new TracingMsg_BeginTracing(category_filter_str,
                                    base::TimeTicks::NowFromSystemTraceTime(),
-                                   options));
+                                   options.ToString()));
 }
 
 void TraceMessageFilter::SendEndTracing() {
@@ -74,11 +74,11 @@ void TraceMessageFilter::SendEndTracing() {
 
 void TraceMessageFilter::SendEnableMonitoring(
     const std::string& category_filter_str,
-    base::debug::TraceLog::Options options) {
+    base::debug::TraceOptions options) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Send(new TracingMsg_EnableMonitoring(category_filter_str,
       base::TimeTicks::NowFromSystemTraceTime(),
-      options));
+      options.ToString()));
 }
 
 void TraceMessageFilter::SendDisableMonitoring() {