Switch to standard integer types in media/.

media/cast/receiver/frame_receiver_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 <deque>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 
 namespace media {
 namespace cast {
 
 namespace {
 
 const int kPacketSize = 1500;
-const uint32 kFirstFrameId = 1234;
+const uint32_t kFirstFrameId = 1234;
 const int kPlayoutDelayMillis = 100;
 
 class FakeFrameClient {
  public:
   FakeFrameClient() : num_called_(0) {}
   virtual ~FakeFrameClient() {}
 
-  void AddExpectedResult(uint32 expected_frame_id,
+  void AddExpectedResult(uint32_t expected_frame_id,
                          const base::TimeTicks& expected_playout_time) {
     expected_results_.push_back(
         std::make_pair(expected_frame_id, expected_playout_time));
   }
 
   void DeliverEncodedFrame(scoped_ptr<EncodedFrame> frame) {
     SCOPED_TRACE(::testing::Message() << "num_called_ is " << num_called_);
     ASSERT_TRUE(frame)
         << "If at shutdown: There were unsatisfied requests enqueued.";
     ASSERT_FALSE(expected_results_.empty());
     EXPECT_EQ(expected_results_.front().first, frame->frame_id);
     EXPECT_EQ(expected_results_.front().second, frame->reference_time);
     expected_results_.pop_front();
     ++num_called_;
   }
 
   int number_times_called() const { return num_called_; }
 
  private:
-  std::deque<std::pair<uint32, base::TimeTicks> > expected_results_;
+  std::deque<std::pair<uint32_t, base::TimeTicks>> expected_results_;
   int num_called_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeFrameClient);
 };
 }  // namespace
 
 class FrameReceiverTest : public ::testing::Test {
  protected:
   FrameReceiverTest() {
     testing_clock_ = new base::SimpleTestTickClock();
@@ skipping 42 matching lines @@
   }
 
   void FeedOneFrameIntoReceiver() {
     // Note: For testing purposes, a frame consists of only a single packet.
     receiver_->ProcessParsedPacket(
         rtp_header_, &payload_[0], payload_.size());
   }
 
   void FeedLipSyncInfoIntoReceiver() {
     const base::TimeTicks now = testing_clock_->NowTicks();
-    const int64 rtp_timestamp = (now - start_time_) *
-        config_.rtp_timebase / base::TimeDelta::FromSeconds(1);
+    const int64_t rtp_timestamp = (now - start_time_) * config_.rtp_timebase /
+                                  base::TimeDelta::FromSeconds(1);
     CHECK_LE(0, rtp_timestamp);
-    uint32 ntp_seconds;
-    uint32 ntp_fraction;
+    uint32_t ntp_seconds;
+    uint32_t ntp_fraction;
     ConvertTimeTicksToNtp(now, &ntp_seconds, &ntp_fraction);
     TestRtcpPacketBuilder rtcp_packet;
-    rtcp_packet.AddSrWithNtp(config_.sender_ssrc,
-                             ntp_seconds, ntp_fraction,
-                             static_cast<uint32>(rtp_timestamp));
+    rtcp_packet.AddSrWithNtp(config_.sender_ssrc, ntp_seconds, ntp_fraction,
+                             static_cast<uint32_t>(rtp_timestamp));
     ASSERT_TRUE(receiver_->ProcessPacket(rtcp_packet.GetPacket().Pass()));
   }
 
   FrameReceiverConfig config_;
-  std::vector<uint8> payload_;
+  std::vector<uint8_t> payload_;
   RtpCastHeader rtp_header_;
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   base::TimeTicks start_time_;
   MockCastTransportSender mock_transport_;
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   FakeFrameClient frame_client_;
 
   // Important for the FrameReceiver to be declared last, since its dependencies
   // must remain alive until after its destruction.
@@ skipping 63 matching lines @@
 
 TEST_F(FrameReceiverTest, ReceivesFramesSkippingWhenAppropriate) {
   CreateFrameReceiverOfAudio();
 
   SimpleEventSubscriber event_subscriber;
   cast_environment_->logger()->Subscribe(&event_subscriber);
 
   EXPECT_CALL(mock_transport_, SendRtcpFromRtpReceiver(_, _, _, _, _, _, _))
       .WillRepeatedly(testing::Return());
 
-  const uint32 rtp_advance_per_frame =
+  const uint32_t rtp_advance_per_frame =
       config_.rtp_timebase / config_.target_frame_rate;
   const base::TimeDelta time_advance_per_frame =
       base::TimeDelta::FromSeconds(1) / config_.target_frame_rate;
 
   // Feed and process lip sync in receiver.
   FeedLipSyncInfoIntoReceiver();
   task_runner_->RunTasks();
   const base::TimeTicks first_frame_capture_time = testing_clock_->NowTicks();
 
   // Enqueue a request for a frame.
@@ skipping 82 matching lines @@
 
 TEST_F(FrameReceiverTest, ReceivesFramesRefusingToSkipAny) {
   CreateFrameReceiverOfVideo();
 
   SimpleEventSubscriber event_subscriber;
   cast_environment_->logger()->Subscribe(&event_subscriber);
 
   EXPECT_CALL(mock_transport_, SendRtcpFromRtpReceiver(_, _, _, _, _, _, _))
       .WillRepeatedly(testing::Return());
 
-  const uint32 rtp_advance_per_frame =
+  const uint32_t rtp_advance_per_frame =
       config_.rtp_timebase / config_.target_frame_rate;
   const base::TimeDelta time_advance_per_frame =
       base::TimeDelta::FromSeconds(1) / config_.target_frame_rate;
 
   // Feed and process lip sync in receiver.
   FeedLipSyncInfoIntoReceiver();
   task_runner_->RunTasks();
   const base::TimeTicks first_frame_capture_time = testing_clock_->NowTicks();
 
   // Enqueue a request for a frame.
@@ skipping 78 matching lines @@
     EXPECT_GE(kFirstFrameId + 3, frame_events[i].frame_id);
     const int frame_offset = frame_events[i].frame_id - kFirstFrameId;
     EXPECT_EQ(frame_offset * rtp_advance_per_frame,
               frame_events[i].rtp_timestamp);
   }
   cast_environment_->logger()->Unsubscribe(&event_subscriber);
 }
 
 }  // namespace cast
 }  // namespace media