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

content/public/browser/tracing_controller.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_TRACING_CONTROLLER_H_
 #define CONTENT_PUBLIC_BROWSER_TRACING_CONTROLLER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 93 matching lines @@
   // that contain a matching category. Having both included and excluded
   // category patterns in the same list would not be supported.
   //
   // Examples: "test_MyTest*",
   //           "test_MyTest*,test_OtherStuff",
   //           "-excluded_category1,-excluded_category2"
   //
   // |options| controls what kind of tracing is enabled.
   typedef base::Callback<void()> EnableRecordingDoneCallback;
   virtual bool EnableRecording(
-      const base::trace_event::CategoryFilter& category_filter,
-      const base::trace_event::TraceOptions& trace_options,
+      const base::trace_event::TraceConfig& trace_config,
       const EnableRecordingDoneCallback& callback) = 0;
 
   // Stop recording on all processes.
   //
   // Child processes typically are caching trace data and only rarely flush
   // and send trace data back to the browser process. That is because it may be
   // an expensive operation to send the trace data over IPC, and we would like
   // to avoid much runtime overhead of tracing. So, to end tracing, we must
   // asynchronously ask all child processes to flush any pending trace data.
   //
@@ skipping 15 matching lines @@
   //
   // Once all child processes have acked to the EnableMonitoring request,
   // EnableMonitoringDoneCallback will be called back.
   //
   // |category_filter| is a filter to control what category groups should be
   // traced.
   //
   // |options| controls what kind of tracing is enabled.
   typedef base::Callback<void()> EnableMonitoringDoneCallback;
   virtual 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) = 0;
 
   // Stop monitoring on all processes.
   //
   // Once all child processes have acked to the DisableMonitoring request,
   // DisableMonitoringDoneCallback is called back.
   typedef base::Callback<void()> DisableMonitoringDoneCallback;
   virtual bool DisableMonitoring(
       const DisableMonitoringDoneCallback& callback) = 0;
 
   // Get the current monitoring configuration.
   virtual void GetMonitoringStatus(
       bool* out_enabled,
-      base::trace_event::CategoryFilter* out_category_filter,
-      base::trace_event::TraceOptions* out_trace_options) = 0;
+      base::trace_event::TraceConfig* out_trace_config) = 0;
 
   // Get the current monitoring traced data.
   //
   // Child processes typically are caching trace data and only rarely flush
   // and send trace data back to the browser process. That is because it may be
   // an expensive operation to send the trace data over IPC, and we would like
   // to avoid much runtime overhead of tracing. So, to end tracing, we must
   // asynchronously ask all child processes to flush any pending trace data.
   //
   // Once all child processes have acked to the CaptureMonitoringSnapshot
@@ skipping 24 matching lines @@
   // watch event callback.
   virtual bool CancelWatchEvent() = 0;
 
  protected:
   virtual ~TracingController() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_TRACING_CONTROLLER_H_