1 files changed, 16 insertions, 12 deletions

diff --git a/media/cast/logging/logging_impl.h b/media/cast/logging/logging_impl.h
index 568bff5360..6c2d863eef 100644
--- a/media/cast/logging/logging_impl.h
+++ b/media/cast/logging/logging_impl.h
@@ -10,6 +10,9 @@
 // 2. UMA stats.
 // 3. Tracing of raw events.
 
+#include "base/memory/ref_counted.h"
+#include "base/task_runner.h"
+#include "media/cast/cast_config.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/logging/logging_raw.h"
 #include "media/cast/logging/logging_stats.h"
@@ -17,32 +20,34 @@
 namespace media {
 namespace cast {
 
-class LoggingImpl {
+// Should only be called from the main thread.
+class LoggingImpl : public base::NonThreadSafe {
  public:
   LoggingImpl(base::TickClock* clock,
-              bool enable_data_collection,
-              bool enable_uma_stats,
-              bool enable_tracing);
+              scoped_refptr<base::TaskRunner> main_thread_proxy,
+              const CastLoggingConfig& config);
 
   ~LoggingImpl();
 
   void InsertFrameEvent(CastLoggingEvent event,
                         uint32 rtp_timestamp,
-                        uint8 frame_id);
+                        uint32 frame_id);
   void InsertFrameEventWithSize(CastLoggingEvent event,
                                 uint32 rtp_timestamp,
-                                uint8 frame_id,
+                                uint32 frame_id,
                                 int frame_size);
   void InsertFrameEventWithDelay(CastLoggingEvent event,
                                  uint32 rtp_timestamp,
-                                 uint8 frame_id,
+                                 uint32 frame_id,
                                  base::TimeDelta delay);
+  void InsertPacketListEvent(CastLoggingEvent event, const PacketList& packets);
+
   void InsertPacketEvent(CastLoggingEvent event,
                          uint32 rtp_timestamp,
-                         uint8 frame_id,
+                         uint32 frame_id,
                          uint16 packet_id,
                          uint16 max_packet_id,
-                         int size);
+                         size_t size);
   void InsertGenericEvent(CastLoggingEvent event, int value);
 
   // Get raw data.
@@ -57,11 +62,10 @@ class LoggingImpl {
   void Reset();
 
  private:
+  scoped_refptr<base::TaskRunner> main_thread_proxy_;
+  const CastLoggingConfig config_;
   LoggingRaw raw_;
   LoggingStats stats_;
-  bool enable_data_collection_;
-  bool enable_uma_stats_;
-  bool enable_tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(LoggingImpl);
 };