Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack.

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 d4d5722d85be15dcdbd0648d88f38d5de494da38..1b9241c006240695589fc7cb922d9bd2f93c2233 100644
--- a/content/browser/tracing/tracing_controller_impl.h
+++ b/content/browser/tracing/tracing_controller_impl.h
@@ -31,20 +31,21 @@ class TracingControllerImpl : public TracingController {
       const GetCategoriesDoneCallback& callback) OVERRIDE;
   virtual bool EnableRecording(
       const std::string& category_filter,
-      TracingController::Options options,
+      base::debug::TraceOptions trace_options,
       const EnableRecordingDoneCallback& callback) OVERRIDE;
   virtual bool DisableRecording(
       const base::FilePath& result_file_path,
       const TracingFileResultCallback& callback) OVERRIDE;
-  virtual bool EnableMonitoring(const std::string& category_filter,
-      TracingController::Options options,
+  virtual bool EnableMonitoring(
+      const std::string& category_filter,
+      base::debug::TraceOptions trace_options,
       const EnableMonitoringDoneCallback& callback) OVERRIDE;
   virtual bool DisableMonitoring(
       const DisableMonitoringDoneCallback& callback) OVERRIDE;
   virtual void GetMonitoringStatus(
       bool* out_enabled,
       std::string* out_category_filter,
-      TracingController::Options* out_options) OVERRIDE;
+      base::debug::TraceOptions* out_trace_options) OVERRIDE;
   virtual bool CaptureMonitoringSnapshot(
       const base::FilePath& result_file_path,
       const TracingFileResultCallback& callback) OVERRIDE;
@@ -133,16 +134,16 @@ class TracingControllerImpl : public TracingController {
 
   void SetEnabledOnFileThread(const std::string& category_filter,
                               int mode,
-                              int options,
+                              base::debug::TraceOptions trace_options,
                               const base::Closure& callback);
   void SetDisabledOnFileThread(const base::Closure& callback);
   void OnEnableRecordingDone(const std::string& category_filter,
-                             int trace_options,
+                             base::debug::TraceOptions trace_options,
                              const EnableRecordingDoneCallback& callback);
   void OnDisableRecordingDone(const base::FilePath& result_file_path,
                               const TracingFileResultCallback& callback);
   void OnEnableMonitoringDone(const std::string& category_filter,
-                              int trace_options,
+                              base::debug::TraceOptions trace_options,
                               const EnableMonitoringDoneCallback& callback);
   void OnDisableMonitoringDone(const DisableMonitoringDoneCallback& callback);
 
@@ -166,7 +167,7 @@ class TracingControllerImpl : public TracingController {
 #endif
   bool is_recording_;
   bool is_monitoring_;
-  TracingController::Options options_;
+  base::debug::TraceOptions trace_options_;
 
   GetCategoriesDoneCallback pending_get_categories_done_callback_;
   TracingFileResultCallback pending_disable_recording_done_callback_;