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

media/mojo/services/media_type_converters_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 "media/mojo/services/media_type_converters.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
+#include "base/macros.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/cdm_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_util.h"
 #include "media/base/sample_format.h"
 #include "media/base/test_helpers.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 namespace {
 
 void CompareBytes(uint8_t* original_data, uint8_t* result_data, size_t length) {
   EXPECT_GT(length, 0u);
   EXPECT_EQ(memcmp(original_data, result_data, length), 0);
 }
 
 // Compare the actual video frame bytes (|rows| rows of |row|bytes| data),
 // skipping any padding that may be in either frame.
-void CompareRowBytes(uint8* original_data,
-                     uint8* result_data,
+void CompareRowBytes(uint8_t* original_data,
+                     uint8_t* result_data,
                      size_t rows,
                      size_t row_bytes,
                      size_t original_stride,
                      size_t result_stride) {
   DCHECK_GE(original_stride, row_bytes);
   DCHECK_GE(result_stride, row_bytes);
 
   for (size_t i = 0; i < rows; ++i) {
     CompareBytes(original_data, result_data, row_bytes);
     original_data += original_stride;
@@ skipping 300 matching lines @@
 
   // Convert to and back.
   interfaces::VideoFramePtr ptr(interfaces::VideoFrame::From(buffer));
   scoped_refptr<VideoFrame> result(ptr.To<scoped_refptr<VideoFrame>>());
 
   // Compare.
   CompareVideoFrames(buffer, result);
 }
 
 }  // namespace media