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

media/cdm/cenc_utils_unittest.cc

 // Copyright 2015 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/cenc_utils.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 const uint8_t kKey1Data[] = {
     0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,
     0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03
 };
 const uint8_t kKey2Data[] = {
     0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,
@@ skipping 525 matching lines @@
   EXPECT_FALSE(ValidatePsshInput(boxes));
 
   // Repeat with |non_pssh_box| first.
   boxes.clear();
   boxes.insert(boxes.end(), non_pssh_box.begin(), non_pssh_box.end());
   boxes.insert(boxes.end(), pssh_box.begin(), pssh_box.end());
   EXPECT_FALSE(ValidatePsshInput(boxes));
 }
 
 }  // namespace media