Switch to standard integer types in media/.

media/cast/net/cast_transport_sender_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 <gtest/gtest.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/values.h"
 #include "media/cast/net/cast_transport_config.h"
 #include "media/cast/net/cast_transport_sender_impl.h"
 #include "media/cast/net/rtcp/rtcp.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 namespace {
-const int64 kStartMillisecond = INT64_C(12345678900000);
-const uint32 kVideoSsrc = 1;
-const uint32 kAudioSsrc = 2;
+const int64_t kStartMillisecond = INT64_C(12345678900000);
+const uint32_t kVideoSsrc = 1;
+const uint32_t kAudioSsrc = 2;
 }  // namespace
 
 class FakePacketSender : public PacketSender {
  public:
   FakePacketSender()
       : paused_(false), packets_sent_(0), bytes_sent_(0) {}
 
   bool SendPacket(PacketRef packet, const base::Closure& cb) final {
     if (paused_) {
       stored_packet_ = packet;
       callback_ = cb;
       return false;
     }
     ++packets_sent_;
     bytes_sent_ += packet->data.size();
     return true;
   }
 
-  int64 GetBytesSent() final { return bytes_sent_; }
+  int64_t GetBytesSent() final { return bytes_sent_; }
 
   void SetPaused(bool paused) {
     paused_ = paused;
     if (!paused && stored_packet_.get()) {
       SendPacket(stored_packet_, callback_);
       callback_.Run();
     }
   }
 
   int packets_sent() const { return packets_sent_; }
 
  private:
   bool paused_;
   base::Closure callback_;
   PacketRef stored_packet_;
   int packets_sent_;
-  int64 bytes_sent_;
+  int64_t bytes_sent_;
 
   DISALLOW_COPY_AND_ASSIGN(FakePacketSender);
 };
 
 class CastTransportSenderImplTest : public ::testing::Test {
  protected:
   CastTransportSenderImplTest() : num_times_logging_callback_called_(0) {
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     task_runner_ = new test::FakeSingleThreadTaskRunner(&testing_clock_);
@@ skipping 177 matching lines @@
 
   transport_.SetPaused(true);
   DedupInfo dedup_info;
   dedup_info.resend_interval = base::TimeDelta::FromMilliseconds(10);
   transport_sender_->ResendPackets(
       kVideoSsrc, missing_packets, true, dedup_info);
 
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   EXPECT_EQ(2, num_times_logging_callback_called_);
 
-  std::vector<uint32> cancel_sending_frames;
+  std::vector<uint32_t> cancel_sending_frames;
   cancel_sending_frames.push_back(1);
   transport_sender_->CancelSendingFrames(kVideoSsrc,
                                          cancel_sending_frames);
   transport_.SetPaused(false);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   EXPECT_EQ(2, num_times_logging_callback_called_);
 
   // Resend one packet in the socket when unpaused.
   EXPECT_EQ(5, transport_.packets_sent());
 }
@@ skipping 116 matching lines @@
   task_runner_->RunTasks();
   EXPECT_EQ(7, transport_.packets_sent());
   EXPECT_EQ(1, num_times_logging_callback_called_);  // Only 8 ms since last.
 
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2));
   EXPECT_EQ(2, num_times_logging_callback_called_);
 }
 
 }  // namespace cast
 }  // namespace media