Switch to standard integer types in media/, take 2.

media/filters/ffmpeg_aac_bitstream_converter_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 <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_aac_bitstream_converter.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 namespace {
 const int kAacMainProfile = 0;
 const int kAacLowComplexityProfile = 1;
@@ skipping 149 matching lines @@
 
   // Check that the ADTS header frame length matches the packet size
   frame_length = ((second_test_packet->data[3] & 0x03) << 11) |
                  ((second_test_packet->data[4] & 0xFF) << 3) |
                  ((second_test_packet->data[5] & 0xE0) >> 5);
 
   EXPECT_EQ(frame_length, second_test_packet->size);
 }
 
 }  // namespace media