Switch to standard integer types in media/.

media/base/key_systems.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/base/key_systems.h"
 
-
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "media/base/key_system_info.h"
 #include "media/base/key_systems_support_uma.h"
 #include "media/base/media_client.h"
 #include "media/cdm/key_system_names.h"
@@ skipping 163 matching lines @@
       const std::string& key_system);
 
   std::string GetKeySystemNameForUMA(const std::string& key_system) const;
 
   bool UseAesDecryptor(const std::string& concrete_key_system) const;
 
 #if defined(ENABLE_PEPPER_CDMS)
   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;
 
   bool IsSupportedInitDataType(const std::string& key_system,
                                EmeInitDataType init_data_type) const override;
 
   EmeConfigRule GetContentTypeConfigRule(
       const std::string& key_system,
       EmeMediaType media_type,
@@ skipping 423 matching lines @@
       DLOG(FATAL) << concrete_key_system << " is not a known concrete system";
       return std::string();
   }
 
   const std::string& type = key_system_iter->second.pepper_type;
   DLOG_IF(FATAL, type.empty()) << concrete_key_system << " is not Pepper-based";
   return type;
 }
 #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);
   if (media_type == EmeMediaType::AUDIO) {
     audio_codec_mask_ |= mask;
   } else {
     video_codec_mask_ |= mask;
   }
 }
 
@@ skipping 257 matching lines @@
   return KeySystemsImpl::GetInstance()->GetPepperType(concrete_key_system);
 }
 #endif
 
 // These two functions are for testing purpose only. The declaration in the
 // header file is guarded by "#if defined(UNIT_TEST)" so that they can be used
 // by tests but not non-test code. However, this .cc file is compiled as part of
 // "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);
 }
 
 }  // namespace media