Switch to standard integer types in media/.

media/base/decrypt_config.h

 // 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.
 
 #ifndef MEDIA_BASE_DECRYPT_CONFIG_H_
 #define MEDIA_BASE_DECRYPT_CONFIG_H_
 
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 // The Common Encryption spec provides for subsample encryption, where portions
 // of a sample are set in cleartext. A SubsampleEntry specifies the number of
 // clear and encrypted bytes in each subsample. For decryption, all of the
 // encrypted bytes in a sample should be considered a single logical stream,
 // regardless of how they are divided into subsamples, and the clear bytes
 // should not be considered as part of decryption. This is logically equivalent
 // to concatenating all 'cypher_bytes' portions of subsamples, decrypting that
 // result, and then copying each byte from the decrypted block over the
 // position of the corresponding encrypted byte.
 struct SubsampleEntry {
   SubsampleEntry() : clear_bytes(0), cypher_bytes(0) {}
-  SubsampleEntry(uint32 clear_bytes, uint32 cypher_bytes)
+  SubsampleEntry(uint32_t clear_bytes, uint32_t cypher_bytes)
       : clear_bytes(clear_bytes), cypher_bytes(cypher_bytes) {}
-  uint32 clear_bytes;
-  uint32 cypher_bytes;
+  uint32_t clear_bytes;
+  uint32_t cypher_bytes;
 };
 
 // Contains all information that a decryptor needs to decrypt a media sample.
 class MEDIA_EXPORT DecryptConfig {
  public:
   // Keys are always 128 bits.
   static const int kDecryptionKeySize = 16;
 
   // |key_id| is the ID that references the decryption key for this sample.
   // |iv| is the initialization vector defined by the encrypted format.
@@ skipping 31 matching lines @@
 };
 
 }  // namespace media
 
 inline std::ostream& operator<<(std::ostream& os,
                                 const media::DecryptConfig& obj) {
   return obj.Print(os);
 }
 
 #endif  // MEDIA_BASE_DECRYPT_CONFIG_H_