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

media/filters/file_data_source_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 <stdint.h>
+
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/test_helpers.h"
 #include "media/filters/file_data_source.h"
 
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 
 namespace media {
 
@@ skipping 54 matching lines @@
 
   EXPECT_CALL(handler, ReadCB(5));
   data_source.Read(5, 10, ten_bytes, base::Bind(
       &ReadCBHandler::ReadCB, base::Unretained(&handler)));
   EXPECT_EQ('5', ten_bytes[0]);
 
   data_source.Stop();
 }
 
 }  // namespace media