Change to calculate the real NTP in TimeTicks.

media/cast/rtcp/rtcp_unittest.cc

 // 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.
 
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
+#include "media/cast/cast_ntp_tick_clock.h"
 #include "media/cast/pacing/paced_sender.h"
 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/rtcp/test_rtcp_packet_builder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 namespace cast {
 
@@ skipping 274 matching lines @@
 
   EXPECT_NEAR(2 * kAddedShortDelay, rtt.InMilliseconds(), 1);
   EXPECT_NEAR((2 * kAddedShortDelay + 2 * kAddedDelay) / 2,
                avg_rtt.InMilliseconds(),
                1);
   EXPECT_NEAR(2 *  kAddedShortDelay, min_rtt.InMilliseconds(), 1);
   EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 1);
 }
 
 TEST_F(RtcpTest, NtpAndTime) {
-  RtcpPeer rtcp_peer(&testing_clock_,
-                     &mock_sender_feedback_,
-                     NULL,
-                     NULL,
-                     NULL,
-                     kRtcpReducedSize,
-                     base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
-                     false,
-                     kReceiverSsrc,
-                     kCName);
   uint32 ntp_seconds = 0;
   uint32 ntp_fractions = 0;
   base::TimeTicks input_time = base::TimeTicks::FromInternalValue(
-    12345678901000LL + kNtpEpochDeltaMicroseconds);
+    12345678901000LL);
   ConvertTimeToNtp(input_time, &ntp_seconds, &ntp_fractions);
   EXPECT_EQ(12345678u, ntp_seconds);
   EXPECT_EQ(input_time,
             ConvertNtpToTime(ntp_seconds, ntp_fractions));
 }
 
 TEST_F(RtcpTest, WrapAround) {
   RtcpPeer rtcp_peer(&testing_clock_,
                      &mock_sender_feedback_,
                      NULL,
@@ skipping 36 matching lines @@
   uint32 rtp_timestamp = 64000;
   base::TimeTicks rtp_timestamp_in_ticks;
 
   // Test fail before we get a OnReceivedLipSyncInfo.
   EXPECT_FALSE(rtcp_peer.RtpTimestampInSenderTime(frequency, rtp_timestamp,
                                                    &rtp_timestamp_in_ticks));
 
   uint32 ntp_seconds = 0;
   uint32 ntp_fractions = 0;
   base::TimeTicks input_time = base::TimeTicks::FromInternalValue(
-      12345678901000LL + kNtpEpochDeltaMicroseconds);
+      12345678901000LL);
 
   // Test exact match.
   ConvertTimeToNtp(input_time, &ntp_seconds, &ntp_fractions);
   rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions);
   EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime(frequency, rtp_timestamp,
                                                   &rtp_timestamp_in_ticks));
   EXPECT_EQ(input_time, rtp_timestamp_in_ticks);
 
   // Test older rtp_timestamp.
   rtp_timestamp = 32000;
@@ skipping 21 matching lines @@
   rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions);
   rtp_timestamp = 64000;
   EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime(frequency, rtp_timestamp,
                                                   &rtp_timestamp_in_ticks));
   EXPECT_EQ(input_time + base::TimeDelta::FromMilliseconds(4000),
             rtp_timestamp_in_ticks);
 }
 
 }  // namespace cast
 }  // namespace media