Switch to standard integer types in media/.

media/cast/logging/receiver_time_offset_estimator_impl_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/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/logging_defines.h"
@@ skipping 32 matching lines @@
   base::SimpleTestTickClock receiver_clock_;
   ReceiverTimeOffsetEstimatorImpl estimator_;
 };
 
 // Suppose the true offset is 100ms.
 // Event A occurred at sender time 20ms.
 // Event B occurred at receiver time 130ms. (sender time 30ms)
 // Event C occurred at sender time 60ms.
 // Then the bound after all 3 events have arrived is [130-60=70, 130-20=110].
 TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
-  int64 true_offset_ms = 100;
+  int64_t true_offset_ms = 100;
   receiver_clock_.Advance(base::TimeDelta::FromMilliseconds(true_offset_ms));
 
   base::TimeDelta lower_bound;
   base::TimeDelta upper_bound;
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   RtpTimestamp rtp_timestamp = 0;
-  uint32 frame_id = 0;
+  uint32_t frame_id = 0;
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
 
   scoped_ptr<FrameEvent> encode_event(new FrameEvent());
   encode_event->timestamp = sender_clock_->NowTicks();
   encode_event->type = FRAME_ENCODED;
   encode_event->media_type = VIDEO_EVENT;
   encode_event->rtp_timestamp = rtp_timestamp;
   encode_event->frame_id = frame_id;
   encode_event->size = 1234;
@@ skipping 42 matching lines @@
   scoped_ptr<FrameEvent> ack_event(new FrameEvent());
   ack_event->timestamp = sender_clock_->NowTicks();
   ack_event->type = FRAME_ACK_RECEIVED;
   ack_event->media_type = VIDEO_EVENT;
   ack_event->rtp_timestamp = rtp_timestamp;
   ack_event->frame_id = frame_id;
   cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
-  int64 lower_bound_ms = lower_bound.InMilliseconds();
-  int64 upper_bound_ms = upper_bound.InMilliseconds();
+  int64_t lower_bound_ms = lower_bound.InMilliseconds();
+  int64_t upper_bound_ms = upper_bound.InMilliseconds();
   EXPECT_EQ(70, lower_bound_ms);
   EXPECT_EQ(110, upper_bound_ms);
   EXPECT_GE(true_offset_ms, lower_bound_ms);
   EXPECT_LE(true_offset_ms, upper_bound_ms);
 }
 
 // Same scenario as above, but event C arrives before event B. It doesn't mean
 // event C occurred before event B.
 TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
-  int64 true_offset_ms = 100;
+  int64_t true_offset_ms = 100;
   receiver_clock_.Advance(base::TimeDelta::FromMilliseconds(true_offset_ms));
 
   base::TimeDelta lower_bound;
   base::TimeDelta upper_bound;
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   RtpTimestamp rtp_timestamp = 0;
-  uint32 frame_id = 0;
+  uint32_t frame_id = 0;
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
 
   scoped_ptr<FrameEvent> encode_event(new FrameEvent());
   encode_event->timestamp = sender_clock_->NowTicks();
   encode_event->type = FRAME_ENCODED;
   encode_event->media_type = VIDEO_EVENT;
   encode_event->rtp_timestamp = rtp_timestamp;
   encode_event->frame_id = frame_id;
   encode_event->size = 1234;
@@ skipping 45 matching lines @@
   scoped_ptr<FrameEvent> ack_sent_event(new FrameEvent());
   ack_sent_event->timestamp = event_b_time;
   ack_sent_event->type = FRAME_ACK_SENT;
   ack_sent_event->media_type = VIDEO_EVENT;
   ack_sent_event->rtp_timestamp = rtp_timestamp;
   ack_sent_event->frame_id = frame_id;
   cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass());
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
-  int64 lower_bound_ms = lower_bound.InMilliseconds();
-  int64 upper_bound_ms = upper_bound.InMilliseconds();
+  int64_t lower_bound_ms = lower_bound.InMilliseconds();
+  int64_t upper_bound_ms = upper_bound.InMilliseconds();
   EXPECT_EQ(70, lower_bound_ms);
   EXPECT_EQ(110, upper_bound_ms);
   EXPECT_GE(true_offset_ms, lower_bound_ms);
   EXPECT_LE(true_offset_ms, upper_bound_ms);
 }
 
 TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
-  int64 true_offset_ms = 100;
+  int64_t true_offset_ms = 100;
   receiver_clock_.Advance(base::TimeDelta::FromMilliseconds(true_offset_ms));
 
   base::TimeDelta lower_bound;
   base::TimeDelta upper_bound;
 
   RtpTimestamp rtp_timestamp_a = 0;
   int frame_id_a = 0;
   RtpTimestamp rtp_timestamp_b = 90;
   int frame_id_b = 1;
   RtpTimestamp rtp_timestamp_c = 180;
@@ skipping 149 matching lines @@
   AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
   ack_event.reset(new FrameEvent());
   ack_event->timestamp = sender_clock_->NowTicks();
   ack_event->type = FRAME_ACK_RECEIVED;
   ack_event->media_type = VIDEO_EVENT;
   ack_event->rtp_timestamp = rtp_timestamp_c;
   ack_event->frame_id = frame_id_c;
   cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
-  int64 lower_bound_ms = lower_bound.InMilliseconds();
-  int64 upper_bound_ms = upper_bound.InMilliseconds();
+  int64_t lower_bound_ms = lower_bound.InMilliseconds();
+  int64_t upper_bound_ms = upper_bound.InMilliseconds();
   EXPECT_GT(lower_bound_ms, 90);
   EXPECT_LE(lower_bound_ms, true_offset_ms);
   EXPECT_LT(upper_bound_ms, 150);
   EXPECT_GT(upper_bound_ms, true_offset_ms);
 }
 
 }  // namespace cast
 }  // namespace media