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

content/browser/tracing/tracing_controller_impl.h

 // Copyright (c) 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_BROWSER_TRACING_TRACING_CONTROLLER_IMPL_H_
 #define CONTENT_BROWSER_TRACING_TRACING_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 class TracingUI;
 
 class TracingControllerImpl
     : public TracingController,
       public base::trace_event::MemoryDumpManagerDelegate {
  public:
   static TracingControllerImpl* GetInstance();
 
   // 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(
       const GetTraceBufferUsageCallback& callback) override;
   bool SetWatchEvent(const std::string& category_name,
                      const std::string& event_name,
                      const WatchEventCallback& callback) override;
   bool CancelWatchEvent() override;
 
   void RegisterTracingUI(TracingUI* tracing_ui);
@@ skipping 75 matching lines @@
                                    bool success);
 
   // Callback of MemoryDumpManager::CreateProcessDump().
   void OnBrowserProcessMemoryDumpDone(uint64 dump_guid, bool success);
 
   void FinalizeGlobalMemoryDumpIfAllProcessesReplied();
 
   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);
 
   void OnMonitoringStateChanged(bool is_monitoring);
 
   TraceMessageFilterSet trace_message_filters_;
 
   // Pending acks for DisableRecording.
   int pending_disable_recording_ack_count_;
   TraceMessageFilterSet pending_disable_recording_filters_;
@@ skipping 13 matching lines @@
   int failed_memory_dump_count_;
   TraceMessageFilterSet pending_memory_dump_filters_;
   uint64 pending_memory_dump_guid_;
   base::trace_event::MemoryDumpCallback pending_memory_dump_callback_;
 
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
   bool is_system_tracing_;
 #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_;
 
   std::string watch_category_name_;
   std::string watch_event_name_;
   WatchEventCallback watch_event_callback_;
 
   std::set<std::string> known_category_groups_;
   std::set<TracingUI*> tracing_uis_;
   scoped_refptr<TraceDataSink> trace_data_sink_;
   scoped_refptr<TraceDataSink> monitoring_data_sink_;
 
   DISALLOW_COPY_AND_ASSIGN(TracingControllerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_TRACING_TRACING_CONTROLLER_IMPL_H_