Revert of Revert "Revert 237280 "Remove TraceController""

content/browser/tracing/tracing_controller_impl.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_BROWSER_TRACING_TRACING_CONTROLLER_IMPL_H_
 #define CONTENT_BROWSER_TRACING_TRACING_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
+#include "content/public/browser/trace_subscriber.h"
 #include "content/public/browser/tracing_controller.h"
 
-namespace base {
-class RefCountedString;
-}
-
 namespace content {
 
 class TraceMessageFilter;
 
 class TracingControllerImpl : public TracingController {
  public:
   static TracingControllerImpl* GetInstance();
 
   // TracingController implementation.
-  virtual bool GetCategories(
+  virtual void GetCategories(
       const GetCategoriesDoneCallback& callback) OVERRIDE;
   virtual bool EnableRecording(
-      const std::string& category_filter,
+      const base::debug::CategoryFilter& filter,
       TracingController::Options 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,
+  virtual bool EnableMonitoring(const base::debug::CategoryFilter& filter,
       TracingController::Options options,
       const EnableMonitoringDoneCallback& callback) OVERRIDE;
   virtual bool DisableMonitoring(
       const DisableMonitoringDoneCallback& callback) OVERRIDE;
   virtual void GetMonitoringStatus(
       bool* out_enabled,
-      std::string* out_category_filter,
+      base::debug::CategoryFilter* out_filter,
       TracingController::Options* out_options) OVERRIDE;
-  virtual bool CaptureMonitoringSnapshot(
+  virtual void CaptureMonitoringSnapshot(
       const base::FilePath& result_file_path,
       const TracingFileResultCallback& callback) OVERRIDE;
   virtual bool GetTraceBufferPercentFull(
       const GetTraceBufferPercentFullCallback& callback) OVERRIDE;
-  virtual bool SetWatchEvent(const std::string& category_name,
-                             const std::string& event_name,
-                             const WatchEventCallback& callback) OVERRIDE;
-  virtual bool CancelWatchEvent() OVERRIDE;
 
  private:
-  typedef std::set<scoped_refptr<TraceMessageFilter> > TraceMessageFilterMap;
+  typedef std::set<scoped_refptr<TraceMessageFilter> > FilterMap;
   class ResultFile;
 
   friend struct base::DefaultLazyInstanceTraits<TracingControllerImpl>;
   friend class TraceMessageFilter;
 
   TracingControllerImpl();
   virtual ~TracingControllerImpl();
 
   bool can_enable_recording() const {
     return !is_recording_;
   }
 
   bool can_disable_recording() const {
     return is_recording_ && !result_file_;
   }
 
   bool can_enable_monitoring() const {
     return !is_monitoring_;
   }
 
   bool can_disable_monitoring() const {
     return is_monitoring_ && !monitoring_snapshot_file_;
   }
 
   bool can_get_trace_buffer_percent_full() const {
     return pending_trace_buffer_percent_full_callback_.is_null();
   }
 
-  bool can_cancel_watch_event() const {
-    return !watch_event_callback_.is_null();
-  }
-
   // Methods for use by TraceMessageFilter.
-  void AddTraceMessageFilter(TraceMessageFilter* trace_message_filter);
-  void RemoveTraceMessageFilter(TraceMessageFilter* trace_message_filter);
+  void AddFilter(TraceMessageFilter* filter);
+  void RemoveFilter(TraceMessageFilter* filter);
 
   void OnTraceDataCollected(
       const scoped_refptr<base::RefCountedString>& events_str_ptr);
   void OnMonitoringTraceDataCollected(
       const scoped_refptr<base::RefCountedString>& events_str_ptr);
 
   // Callback of TraceLog::Flush() for the local trace.
   void OnLocalTraceDataCollected(
       const scoped_refptr<base::RefCountedString>& events_str_ptr,
       bool has_more_events);
   // Callback of TraceLog::FlushMonitoring() for the local trace.
   void OnLocalMonitoringTraceDataCollected(
       const scoped_refptr<base::RefCountedString>& events_str_ptr,
       bool has_more_events);
 
   void OnDisableRecordingAcked(
       const std::vector<std::string>& known_category_groups);
   void OnResultFileClosed();
 
   void OnCaptureMonitoringSnapshotAcked();
   void OnMonitoringSnapshotFileClosed();
 
+  void OnTraceNotification(int notification);
   void OnTraceBufferPercentFullReply(float percent_full);
 
-  void OnWatchEventMatched();
-
-  TraceMessageFilterMap trace_message_filters_;
+  FilterMap filters_;
   // Pending acks for DisableRecording.
   int pending_disable_recording_ack_count_;
   // Pending acks for CaptureMonitoringSnapshot.
   int pending_capture_monitoring_snapshot_ack_count_;
   // Pending acks for GetTraceBufferPercentFull.
   int pending_trace_buffer_percent_full_ack_count_;
   float maximum_trace_buffer_percent_full_;
 
   bool is_recording_;
   bool is_monitoring_;
 
   GetCategoriesDoneCallback pending_get_categories_done_callback_;
   TracingFileResultCallback pending_disable_recording_done_callback_;
   TracingFileResultCallback pending_capture_monitoring_snapshot_done_callback_;
   GetTraceBufferPercentFullCallback pending_trace_buffer_percent_full_callback_;
 
-  std::string watch_category_name_;
-  std::string watch_event_name_;
-  WatchEventCallback watch_event_callback_;
-
   std::set<std::string> known_category_groups_;
+  base::debug::CategoryFilter category_filter_;
   scoped_ptr<ResultFile> result_file_;
   scoped_ptr<ResultFile> monitoring_snapshot_file_;
   DISALLOW_COPY_AND_ASSIGN(TracingControllerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_TRACING_TRACING_CONTROLLER_IMPL_H_