Switch to standard integer types in media/.

media/cast/logging/serialize_deserialize_test.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.
 
 // Joint LogSerializer and LogDeserializer testing to make sure they stay in
 // sync.
 
 #include "base/memory/scoped_ptr.h"
 #include "media/cast/logging/log_deserializer.h"
 #include "media/cast/logging/log_serializer.h"
@@ skipping 13 matching lines @@
     media::cast::FRAME_ENCODED, media::cast::FRAME_DECODED,
     media::cast::FRAME_PLAYOUT };
 
 const media::cast::CastLoggingEvent kVideoPacketEvents[] = {
     media::cast::PACKET_SENT_TO_NETWORK, media::cast::PACKET_RECEIVED};
 
 // The frame event fields cycle through these numbers.
 const int kWidth[] = {1280, 1280, 1280, 1280, 1920, 1920, 1920, 1920};
 const int kHeight[] = {720, 720, 720, 720, 1080, 1080, 1080, 1080};
 const int kEncodedFrameSize[] = {512, 425, 399, 400, 237};
-const int64 kDelayMillis[] = {15, 4, 8, 42, 23, 16};
+const int64_t kDelayMillis[] = {15, 4, 8, 42, 23, 16};
 const int kEncoderCPUPercentUtilized[] = {10, 9, 42, 3, 11, 12, 15, 7};
 const int kIdealizedBitratePercentUtilized[] = {9, 9, 9, 15, 36, 38, 35, 40};
 
 const int kMaxSerializedBytes = 10000;
 
 }
 
 namespace media {
 namespace cast {
 
 class SerializeDeserializeTest : public ::testing::Test {
  protected:
   SerializeDeserializeTest()
       : serialized_(new char[kMaxSerializedBytes]), output_bytes_(0) {}
 
   ~SerializeDeserializeTest() override {}
 
   void Init() {
     metadata_.set_first_rtp_timestamp(12345678 * 90);
     metadata_.set_is_audio(false);
     metadata_.set_num_frame_events(10);
     metadata_.set_num_packet_events(10);
 
-    int64 event_time_ms = 0;
+    int64_t event_time_ms = 0;
     // Insert frame and packet events with RTP timestamps 0, 90, 180, ...
     for (int i = 0; i < metadata_.num_frame_events(); i++) {
       linked_ptr<AggregatedFrameEvent> frame_event(new AggregatedFrameEvent);
       frame_event->set_relative_rtp_timestamp(i * 90);
-      for (uint32 event_index = 0; event_index < arraysize(kVideoFrameEvents);
+      for (uint32_t event_index = 0; event_index < arraysize(kVideoFrameEvents);
            ++event_index) {
         frame_event->add_event_type(
             ToProtoEventType(kVideoFrameEvents[event_index]));
         frame_event->add_event_timestamp_ms(event_time_ms);
         event_time_ms += 1024;
       }
       frame_event->set_width(kWidth[i % arraysize(kWidth)]);
       frame_event->set_height(kHeight[i % arraysize(kHeight)]);
       frame_event->set_encoded_frame_size(
           kEncodedFrameSize[i % arraysize(kEncodedFrameSize)]);
       frame_event->set_delay_millis(kDelayMillis[i % arraysize(kDelayMillis)]);
       frame_event->set_encoder_cpu_percent_utilized(kEncoderCPUPercentUtilized[
               i % arraysize(kEncoderCPUPercentUtilized)]);
       frame_event->set_idealized_bitrate_percent_utilized(
           kIdealizedBitratePercentUtilized[
               i % arraysize(kIdealizedBitratePercentUtilized)]);
 
       frame_event_list_.push_back(frame_event);
     }
 
     event_time_ms = 0;
     int packet_id = 0;
     for (int i = 0; i < metadata_.num_packet_events(); i++) {
       linked_ptr<AggregatedPacketEvent> packet_event(new AggregatedPacketEvent);
       packet_event->set_relative_rtp_timestamp(i * 90);
       for (int j = 0; j < 10; j++) {
         BasePacketEvent* base_event = packet_event->add_base_packet_event();
         base_event->set_packet_id(packet_id);
         packet_id++;
-        for (uint32 event_index = 0;
-             event_index < arraysize(kVideoPacketEvents);
-             ++event_index) {
+        for (uint32_t event_index = 0;
+             event_index < arraysize(kVideoPacketEvents); ++event_index) {
           base_event->add_event_type(
               ToProtoEventType(kVideoPacketEvents[event_index]));
           base_event->add_event_timestamp_ms(event_time_ms);
           event_time_ms += 256;
         }
       }
       packet_event_list_.push_back(packet_event);
     }
   }
 
@@ skipping 110 matching lines @@
                                  compressed,
                                  100,
                                  serialized_.get(),
                                  &output_bytes_);
   EXPECT_FALSE(success);
   EXPECT_EQ(0, output_bytes_);
 }
 
 }  // namespace cast
 }  // namespace media