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

media/base/bit_reader_unittest.cc

 // Copyright (c) 2012 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 "media/base/bit_reader.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 static void SetBit(uint8_t* buf, size_t size, size_t bit_pos) {
   size_t byte_pos = bit_pos / 8;
   bit_pos -= byte_pos * 8;
   DCHECK_LT(byte_pos, size);
   buf[byte_pos] |= (1 << (7 - bit_pos));
 }
@@ skipping 115 matching lines @@
   EXPECT_EQ(reader1.bits_available(), 115);
   EXPECT_TRUE(reader1.ReadFlag(&flag));
   EXPECT_EQ(reader1.bits_read(), 6);
   EXPECT_EQ(reader1.bits_available(), 114);
   EXPECT_TRUE(reader1.SkipBits(76));
   EXPECT_EQ(reader1.bits_read(), 82);
   EXPECT_EQ(reader1.bits_available(), 38);
 }
 
 }  // namespace media