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

content/browser/tracing/tracing_controller_impl.h

Index: content/browser/tracing/tracing_controller_impl.h
diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h
index fb54da665484fc7b6c00c55782a97558e5ac8e50..e1201902d384323f93265fd5c35c06167fc8075e 100644
--- a/content/browser/tracing/tracing_controller_impl.h
+++ b/content/browser/tracing/tracing_controller_impl.h
@@ -31,20 +31,17 @@ class TracingControllerImpl
 
   // TracingController implementation.
   bool GetCategories(const GetCategoriesDoneCallback& callback) override;
-  bool EnableRecording(const base::trace_event::CategoryFilter& category_filter,
-                       const base::trace_event::TraceOptions& trace_options,
+  bool EnableRecording(const base::trace_event::TraceConfig& trace_config,
                        const EnableRecordingDoneCallback& callback) override;
   bool DisableRecording(const scoped_refptr<TraceDataSink>& sink) override;
   bool EnableMonitoring(
-      const base::trace_event::CategoryFilter& category_filter,
-      const base::trace_event::TraceOptions& trace_options,
+      const base::trace_event::TraceConfig& trace_config,
       const EnableMonitoringDoneCallback& callback) override;
   bool DisableMonitoring(
       const DisableMonitoringDoneCallback& callback) override;
   void GetMonitoringStatus(
       bool* out_enabled,
-      base::trace_event::CategoryFilter* out_category_filter,
-      base::trace_event::TraceOptions* out_trace_options) override;
+      base::trace_event::TraceConfig* out_trace_config) override;
   bool CaptureMonitoringSnapshot(
       const scoped_refptr<TraceDataSink>& sink) override;
   bool GetTraceBufferUsage(
@@ -140,19 +137,16 @@ class TracingControllerImpl
   void OnWatchEventMatched();
 
   void SetEnabledOnFileThread(
-      const base::trace_event::CategoryFilter& category_filter,
+      const base::trace_event::TraceConfig& trace_config,
       int mode,
-      const base::trace_event::TraceOptions& trace_options,
       const base::Closure& callback);
   void SetDisabledOnFileThread(const base::Closure& callback);
   void OnEnableRecordingDone(
-      const base::trace_event::CategoryFilter& category_filter,
-      const base::trace_event::TraceOptions& trace_options,
+      const base::trace_event::TraceConfig& trace_config,
       const EnableRecordingDoneCallback& callback);
   void OnDisableRecordingDone();
   void OnEnableMonitoringDone(
-      const base::trace_event::CategoryFilter& category_filter,
-      const base::trace_event::TraceOptions& trace_options,
+      const base::trace_event::TraceConfig& trace_config,
       const EnableMonitoringDoneCallback& callback);
   void OnDisableMonitoringDone(const DisableMonitoringDoneCallback& callback);
 
@@ -186,7 +180,6 @@ class TracingControllerImpl
 #endif
   bool is_recording_;
   bool is_monitoring_;
-  base::trace_event::TraceOptions trace_options_;
 
   GetCategoriesDoneCallback pending_get_categories_done_callback_;
   GetTraceBufferUsageCallback pending_trace_buffer_usage_callback_;