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

components/tracing/child_trace_message_filter.h

Index: components/tracing/child_trace_message_filter.h
diff --git a/components/tracing/child_trace_message_filter.h b/components/tracing/child_trace_message_filter.h
index e3226bca2b319fe12b1ffbc834a4126456793059..494d25dfd5e1341fb132d78a620bb67e82dad895 100644
--- a/components/tracing/child_trace_message_filter.h
+++ b/components/tracing/child_trace_message_filter.h
@@ -40,13 +40,11 @@ class ChildTraceMessageFilter : public IPC::MessageFilter {
 
  private:
   // Message handlers.
-  void OnBeginTracing(const std::string& category_filter_str,
-                      base::TraceTicks browser_time,
-                      const std::string& options);
+  void OnBeginTracing(const std::string& trace_config_str,
+                      base::TraceTicks browser_time);
   void OnEndTracing();
-  void OnEnableMonitoring(const std::string& category_filter_str,
-                          base::TraceTicks browser_time,
-                          const std::string& options);
+  void OnEnableMonitoring(const std::string& trace_config_str,
+                          base::TraceTicks browser_time);
   void OnDisableMonitoring();
   void OnCaptureMonitoringSnapshot();
   void OnGetTraceLogStatus();