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

media/cast/net/rtcp/rtcp_utility_unittest.cc

 // Copyright 2014 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/net/cast_transport_defines.h"
 #include "media/cast/net/rtcp/rtcp_utility.h"
 #include "media/cast/net/rtcp/test_rtcp_packet_builder.h"
@@ skipping 22 matching lines @@
         parser.has_last_report() ||
         parser.has_receiver_log() ||
         parser.has_cast_message() ||
         parser.has_receiver_reference_time_report();
   }
 
   void ExpectSenderInfo(const RtcpParser& parser) {
     EXPECT_TRUE(parser.has_sender_report());
     EXPECT_EQ(kNtpHigh, parser.sender_report().ntp_seconds);
     EXPECT_EQ(kNtpLow, parser.sender_report().ntp_fraction);
-    EXPECT_EQ(kRtpTimestamp, parser.sender_report().rtp_timestamp);
+    EXPECT_EQ(kRtpTimestamp,
+              parser.sender_report().rtp_timestamp.lower_32_bits());
     EXPECT_EQ(kSendPacketCount, parser.sender_report().send_packet_count);
     EXPECT_EQ(kSendOctetCount, parser.sender_report().send_octet_count);
   }
 
   void ExpectLastReport(const RtcpParser& parser) {
     EXPECT_TRUE(parser.has_last_report());
     EXPECT_EQ(kLastSr, parser.last_report());
     EXPECT_EQ(kDelayLastSr, parser.delay_since_last_report());
   }
 
@@ skipping 268 matching lines @@
 }
 
 TEST_F(RtcpParserTest, InjectReceiverReportWithReceiverLogVerificationBase) {
   static const uint32 kTimeBaseMs = 12345678;
   static const uint32 kTimeDelayMs = 10;
   static const uint32 kDelayDeltaMs = 123;
   base::SimpleTestTickClock testing_clock;
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeBaseMs));
 
   RtcpReceiverLogMessage receiver_log;
-  RtcpReceiverFrameLogMessage frame_log(kRtpTimestamp);
+  RtcpReceiverFrameLogMessage frame_log(RtpTimeTicks().Expand(kRtpTimestamp));
   RtcpReceiverEventLogMessage event_log;
 
   event_log.type = FRAME_ACK_SENT;
   event_log.event_timestamp = testing_clock.NowTicks();
   event_log.delay_delta = base::TimeDelta::FromMilliseconds(kDelayDeltaMs);
   frame_log.event_log_messages_.push_back(event_log);
 
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeDelayMs));
   event_log.type = PACKET_RECEIVED;
   event_log.event_timestamp = testing_clock.NowTicks();
@@ skipping 24 matching lines @@
 TEST_F(RtcpParserTest, InjectReceiverReportWithReceiverLogVerificationMulti) {
   static const uint32 kTimeBaseMs = 12345678;
   static const uint32 kTimeDelayMs = 10;
   static const int kDelayDeltaMs = 123;  // To be varied for every frame.
   base::SimpleTestTickClock testing_clock;
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeBaseMs));
 
   RtcpReceiverLogMessage receiver_log;
 
   for (int j = 0; j < 100; ++j) {
-    RtcpReceiverFrameLogMessage frame_log(kRtpTimestamp);
+    RtcpReceiverFrameLogMessage frame_log(RtpTimeTicks().Expand(kRtpTimestamp));
     RtcpReceiverEventLogMessage event_log;
     event_log.type = FRAME_ACK_SENT;
     event_log.event_timestamp = testing_clock.NowTicks();
     event_log.delay_delta =
         base::TimeDelta::FromMilliseconds((j - 50) * kDelayDeltaMs);
     frame_log.event_log_messages_.push_back(event_log);
     receiver_log.push_back(frame_log);
     testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeDelayMs));
   }
 
   TestRtcpPacketBuilder p;
   p.AddRr(kSenderSsrc, 1);
   p.AddRb(kSourceSsrc);
   p.AddReceiverLog(kSenderSsrc);
   for (int i = 0; i < 100; ++i) {
     p.AddReceiverFrameLog(kRtpTimestamp, 1, kTimeBaseMs + i * kTimeDelayMs);
     const int delay = (i - 50) * kDelayDeltaMs;
     p.AddReceiverEventLog(static_cast<uint16>(delay), FRAME_ACK_SENT, 0);
   }
 
   RtcpParser parser(kSourceSsrc, kSenderSsrc);
   EXPECT_TRUE(parser.Parse(p.Reader()));
   ExpectReceiverLog(parser, receiver_log);
 }
 
 }  // namespace cast
 }  // namespace media