Replace uses of raw uint32's with a type-checked RtpTimeTicks data type.

media/cast/logging/encoding_event_subscriber.cc

Index: media/cast/logging/encoding_event_subscriber.cc
diff --git a/media/cast/logging/encoding_event_subscriber.cc b/media/cast/logging/encoding_event_subscriber.cc
index 82ec06f2bae16ee9914668c67beb8d5b08d2d7dc..e9101faf9f1ddaf4ea432054b52ac0c9d5083249 100644
--- a/media/cast/logging/encoding_event_subscriber.cc
+++ b/media/cast/logging/encoding_event_subscriber.cc
@@ -49,12 +49,9 @@ namespace cast {
 EncodingEventSubscriber::EncodingEventSubscriber(
     EventMediaType event_media_type,
     size_t max_frames)
-    : event_media_type_(event_media_type),
-      max_frames_(max_frames),
-      frame_event_storage_index_(0),
-      packet_event_storage_index_(0),
-      seen_first_rtp_timestamp_(false),
-      first_rtp_timestamp_(0u) {}
+    : event_media_type_(event_media_type), max_frames_(max_frames) {
+  Reset();
+}
 
 EncodingEventSubscriber::~EncodingEventSubscriber() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -67,7 +64,7 @@ void EncodingEventSubscriber::OnReceiveFrameEvent(
   if (event_media_type_ != frame_event.media_type)
     return;
 
-  RtpTimestamp relative_rtp_timestamp =
+  const RtpTimeDelta relative_rtp_timestamp =
       GetRelativeRtpTimestamp(frame_event.rtp_timestamp);
   FrameEventMap::iterator it = frame_event_map_.find(relative_rtp_timestamp);
   linked_ptr<AggregatedFrameEvent> event_proto;
@@ -75,7 +72,8 @@ void EncodingEventSubscriber::OnReceiveFrameEvent(
   // Look up existing entry. If not found, create a new entry and add to map.
   if (it == frame_event_map_.end()) {
     event_proto.reset(new AggregatedFrameEvent);
-    event_proto->set_relative_rtp_timestamp(relative_rtp_timestamp);
+    event_proto->set_relative_rtp_timestamp(
+        relative_rtp_timestamp.lower_32_bits());
     frame_event_map_.insert(
         std::make_pair(relative_rtp_timestamp, event_proto));
   } else {
@@ -85,7 +83,8 @@ void EncodingEventSubscriber::OnReceiveFrameEvent(
                << ". Using new frame event proto.";
       AddFrameEventToStorage(event_proto);
       event_proto.reset(new AggregatedFrameEvent);
-      event_proto->set_relative_rtp_timestamp(relative_rtp_timestamp);
+      event_proto->set_relative_rtp_timestamp(
+          relative_rtp_timestamp.lower_32_bits());
       it->second = event_proto;
     }
   }
@@ -133,7 +132,7 @@ void EncodingEventSubscriber::OnReceivePacketEvent(
   if (event_media_type_ != packet_event.media_type)
     return;
 
-  RtpTimestamp relative_rtp_timestamp =
+  const RtpTimeDelta relative_rtp_timestamp =
       GetRelativeRtpTimestamp(packet_event.rtp_timestamp);
   PacketEventMap::iterator it =
       packet_event_map_.find(relative_rtp_timestamp);
@@ -143,7 +142,8 @@ void EncodingEventSubscriber::OnReceivePacketEvent(
   // Look up existing entry. If not found, create a new entry and add to map.
   if (it == packet_event_map_.end()) {
     event_proto.reset(new AggregatedPacketEvent);
-    event_proto->set_relative_rtp_timestamp(relative_rtp_timestamp);
+    event_proto->set_relative_rtp_timestamp(
+        relative_rtp_timestamp.lower_32_bits());
     packet_event_map_.insert(
         std::make_pair(relative_rtp_timestamp, event_proto));
     base_packet_event_proto = GetNewBasePacketEvent(
@@ -170,7 +170,8 @@ void EncodingEventSubscriber::OnReceivePacketEvent(
                  << "Using new packet event proto.";
         AddPacketEventToStorage(event_proto);
         event_proto.reset(new AggregatedPacketEvent);
-        event_proto->set_relative_rtp_timestamp(relative_rtp_timestamp);
+        event_proto->set_relative_rtp_timestamp(
+            relative_rtp_timestamp.lower_32_bits());
         it->second = event_proto;
       }
 
@@ -183,7 +184,8 @@ void EncodingEventSubscriber::OnReceivePacketEvent(
                << packet_event.packet_id << ". Using new packet event proto.";
       AddPacketEventToStorage(event_proto);
       event_proto.reset(new AggregatedPacketEvent);
-      event_proto->set_relative_rtp_timestamp(relative_rtp_timestamp);
+      event_proto->set_relative_rtp_timestamp(
+          relative_rtp_timestamp.lower_32_bits());
       it->second = event_proto;
       base_packet_event_proto = GetNewBasePacketEvent(
           event_proto.get(), packet_event.packet_id, packet_event.size);
@@ -222,7 +224,7 @@ void EncodingEventSubscriber::GetEventsAndReset(LogMetadata* metadata,
             &IsRtpTimestampLessThan<linked_ptr<AggregatedPacketEvent> >);
 
   metadata->set_is_audio(event_media_type_ == AUDIO_EVENT);
-  metadata->set_first_rtp_timestamp(first_rtp_timestamp_);
+  metadata->set_first_rtp_timestamp(first_rtp_timestamp_.lower_32_bits());
   metadata->set_num_frame_events(frame_event_storage_.size());
   metadata->set_num_packet_events(packet_event_storage_.size());
   metadata->set_reference_timestamp_ms_at_unix_epoch(
@@ -277,8 +279,8 @@ void EncodingEventSubscriber::AddPacketEventToStorage(
   packet_event_storage_index_ = (packet_event_storage_index_ + 1) % max_frames_;
 }
 
-RtpTimestamp EncodingEventSubscriber::GetRelativeRtpTimestamp(
-    RtpTimestamp rtp_timestamp) {
+RtpTimeDelta EncodingEventSubscriber::GetRelativeRtpTimestamp(
+    RtpTimeTicks rtp_timestamp) {
   if (!seen_first_rtp_timestamp_) {
     seen_first_rtp_timestamp_ = true;
     first_rtp_timestamp_ = rtp_timestamp;
@@ -295,7 +297,7 @@ void EncodingEventSubscriber::Reset() {
   packet_event_storage_.clear();
   packet_event_storage_index_ = 0;
   seen_first_rtp_timestamp_ = false;
-  first_rtp_timestamp_ = 0u;
+  first_rtp_timestamp_ = RtpTimeTicks();
 }
 
 }  // namespace cast