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

media/cdm/json_web_key_unittest.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/json_web_key.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/base64.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 class JSONWebKeyTest : public testing::Test {
  public:
   JSONWebKeyTest() {}
 
  protected:
   void ExtractJWKKeysAndExpect(const std::string& jwk,
@@ skipping 612 matching lines @@
   key_ids.push_back(std::vector<uint8_t>(data3, data3 + arraysize(data3)));
   std::vector<uint8_t> init_data3;
   CreateKeyIdsInitData(key_ids, &init_data3);
   std::string result3(init_data3.begin(), init_data3.end());
   EXPECT_EQ(result3,
             "{\"kids\":[\"AQI\",\"AQIDBA\",\"AQIDBAUGBwgJCgsMDQ4PEA\"]}");
 }
 
 }  // namespace media