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

media/cdm/ppapi/cdm_file_io_test.cc

 // Copyright 2013 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/cdm/ppapi/cdm_file_io_test.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace media {
 
 #define FILE_IO_DVLOG(level) DVLOG(level) << "File IO Test: "
 
 const uint8_t kData[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
                          0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
 const uint32_t kDataSize = arraysize(kData);
 
 const uint8_t kBigData[] = {
@@ skipping 585 matching lines @@
 void FileIOTest::OnTestComplete(bool success) {
   while (!file_io_stack_.empty()) {
     file_io_stack_.top()->Close();
     file_io_stack_.pop();
   }
   FILE_IO_DVLOG(3) << test_name_ << (success ? " PASSED" : " FAILED");
   base::ResetAndReturn(&completion_cb_).Run(success);
 }
 
 }  // namespace media