tracing: split trace event filter classes out of TraceLog

base/trace_event/trace_log.h

 // Copyright 2015 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 BASE_TRACE_EVENT_TRACE_LOG_H_
 #define BASE_TRACE_EVENT_TRACE_LOG_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 17 matching lines @@
 struct DefaultSingletonTraits;
 class MessageLoop;
 class RefCountedString;
 
 namespace trace_event {
 
 struct TraceCategory;
 class TraceBuffer;
 class TraceBufferChunk;
 class TraceEvent;
+class TraceEventFilter;
 class TraceEventMemoryOverhead;
 
 struct BASE_EXPORT TraceLogStatus {
   TraceLogStatus();
   ~TraceLogStatus();
   uint32_t event_capacity;
   uint32_t event_count;
 };
 
 class BASE_EXPORT TraceLog : public MemoryDumpProvider {
@@ skipping 223 matching lines @@
   void EndFilteredEvent(const unsigned char* category_group_enabled,
                         const char* name,
                         TraceEventHandle handle);
 
   int process_id() const { return process_id_; }
 
   uint64_t MangleEventId(uint64_t id);
 
   // Exposed for unittesting:
 
+  // Testing factory for TraceEventFilter.
+  typedef std::unique_ptr<TraceEventFilter> (*FilterFactoryForTesting)(
+      const std::string& /* predicate_name */);
+  void SetFilterFactoryForTesting(FilterFactoryForTesting factory) {
+    filter_factory_for_testing_ = factory;
+  }
+
   // Allows deleting our singleton instance.
   static void DeleteForTesting();
 
-  class BASE_EXPORT TraceEventFilter {
-   public:
-    static const char* const kEventWhitelistPredicate;
-    static const char* const kHeapProfilerPredicate;
-
-    TraceEventFilter() {}
-    virtual ~TraceEventFilter() {}
-    virtual bool FilterTraceEvent(const TraceEvent& trace_event) const = 0;
-    virtual void EndEvent(const char* category_group, const char* name) {}
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(TraceEventFilter);
-  };
-  typedef std::unique_ptr<TraceEventFilter> (
-      *TraceEventFilterConstructorForTesting)(void);
-  static void SetTraceEventFilterConstructorForTesting(
-      TraceEventFilterConstructorForTesting predicate);
-
   // Allow tests to inspect TraceEvents.
   TraceEvent* GetEventByHandle(TraceEventHandle handle);
 
   void SetProcessID(int process_id);
 
   // Process sort indices, if set, override the order of a process will appear
   // relative to other processes in the trace viewer. Processes are sorted first
   // on their sort index, ascending, then by their name, and then tid.
   void SetProcessSortIndex(int sort_index);
 
@@ skipping 187 matching lines @@
   std::unique_ptr<TraceBufferChunk> thread_shared_chunk_;
   size_t thread_shared_chunk_index_;
 
   // Set when asynchronous Flush is in progress.
   OutputCallback flush_output_callback_;
   scoped_refptr<SingleThreadTaskRunner> flush_task_runner_;
   ArgumentFilterPredicate argument_filter_predicate_;
   subtle::AtomicWord generation_;
   bool use_worker_thread_;
 
+  FilterFactoryForTesting filter_factory_for_testing_;
+
   DISALLOW_COPY_AND_ASSIGN(TraceLog);
 };
 
 }  // namespace trace_event
 }  // namespace base
 
 #endif  // BASE_TRACE_EVENT_TRACE_LOG_H_