[Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions

components/tracing/tracing_messages.h

Index: components/tracing/tracing_messages.h
diff --git a/components/tracing/tracing_messages.h b/components/tracing/tracing_messages.h
index 831652e4cf558f7fea6840ebd6007c2c78386b0b..14f31bb1079fb8ee27d62d86f2422b83f2e738ed 100644
--- a/components/tracing/tracing_messages.h
+++ b/components/tracing/tracing_messages.h
@@ -32,19 +32,17 @@ IPC_ENUM_TRAITS_MAX_VALUE(
     static_cast<int>(base::trace_event::MemoryDumpType::LAST))
 
 // Sent to all child processes to enable trace event recording.
-IPC_MESSAGE_CONTROL3(TracingMsg_BeginTracing,
-                     std::string /*  category_filter_str */,
-                     base::TraceTicks /* browser_time */,
-                     std::string /* base::trace_event::TraceOptions */)
+IPC_MESSAGE_CONTROL2(TracingMsg_BeginTracing,
+                     std::string /*  trace_config_str */,
+                     base::TraceTicks /* browser_time */)
 
 // Sent to all child processes to disable trace event recording.
 IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing)
 
 // Sent to all child processes to start monitoring.
-IPC_MESSAGE_CONTROL3(TracingMsg_EnableMonitoring,
-                     std::string /*  category_filter_str */,
-                     base::TraceTicks /* browser_time */,
-                     std::string /* base::trace_event::TraceOptions */)
+IPC_MESSAGE_CONTROL2(TracingMsg_EnableMonitoring,
+                     std::string /*  trace_config_str */,
+                     base::TraceTicks /* browser_time */)
 
 // Sent to all child processes to stop monitoring.
 IPC_MESSAGE_CONTROL0(TracingMsg_DisableMonitoring)