Switch to standard integer types in media/.

media/base/key_systems.cc

Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index b2f482d68f8cdaf468e60dd7fa77b52347ea8f8d..dde35d037dd78453ed37b051a106b5f4815e0656 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -4,7 +4,6 @@
 
 #include "media/base/key_systems.h"
 
-
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -188,11 +187,10 @@ class KeySystemsImpl : public KeySystems {
   std::string GetPepperType(const std::string& concrete_key_system) const;
 #endif
 
-  void AddContainerMask(const std::string& container, uint32 mask);
-  void AddCodecMask(
-      EmeMediaType media_type,
-      const std::string& codec,
-      uint32 mask);
+  void AddContainerMask(const std::string& container, uint32_t mask);
+  void AddCodecMask(EmeMediaType media_type,
+                    const std::string& codec,
+                    uint32_t mask);
 
   // Implementation of KeySystems interface.
   bool IsSupportedKeySystem(const std::string& key_system) const override;
@@ -636,18 +634,16 @@ std::string KeySystemsImpl::GetPepperType(
 }
 #endif
 
-void KeySystemsImpl::AddContainerMask(
-    const std::string& container,
-    uint32 mask) {
+void KeySystemsImpl::AddContainerMask(const std::string& container,
+                                      uint32_t mask) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!container_to_codec_mask_map_.count(container));
   container_to_codec_mask_map_[container] = static_cast<EmeCodec>(mask);
 }
 
-void KeySystemsImpl::AddCodecMask(
-    EmeMediaType media_type,
-    const std::string& codec,
-    uint32 mask) {
+void KeySystemsImpl::AddCodecMask(EmeMediaType media_type,
+                                  const std::string& codec,
+                                  uint32_t mask) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!codec_string_map_.count(codec));
   codec_string_map_[codec] = static_cast<EmeCodec>(mask);
@@ -925,14 +921,14 @@ std::string GetPepperType(const std::string& concrete_key_system) {
 // "media" where "UNIT_TEST" is not defined. So we need to specify
 // "MEDIA_EXPORT" here again so that they are visible to tests.
 
-MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32 mask) {
+MEDIA_EXPORT void AddContainerMask(const std::string& container,
+                                   uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddContainerMask(container, mask);
 }
 
-MEDIA_EXPORT void AddCodecMask(
-    EmeMediaType media_type,
-    const std::string& codec,
-    uint32 mask) {
+MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type,
+                               const std::string& codec,
+                               uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
 }