Change EmeInitDataType to be an enum class

media/base/key_systems.h

 // 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.
 
 #ifndef MEDIA_BASE_KEY_SYSTEMS_H_
 #define MEDIA_BASE_KEY_SYSTEMS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 // Prefixed EME API only supports prefixed (webkit-) key system name for
 // certain key systems. But internally only unprefixed key systems are
 // supported. The following two functions help convert between prefixed and
 // unprefixed key system names.
 
 // Gets the unprefixed key system name for |key_system|.
 MEDIA_EXPORT std::string GetUnprefixedKeySystemName(
     const std::string& key_system);
 
 // Gets the prefixed key system name for |key_system|.
 MEDIA_EXPORT std::string GetPrefixedKeySystemName(
     const std::string& key_system);
 
-// Returns false if a container-specific |init_data_type| is specified with an
-// inappropriate container.
-// TODO(sandersd): Remove this essentially internal detail if the spec is
-// updated to not convolve the two in a single method call.
-// TODO(sandersd): Use enum values instead of strings. http://crbug.com/417440
-MEDIA_EXPORT bool IsSaneInitDataTypeWithContainer(
-    const std::string& init_data_type,
-    const std::string& container);
-
 // Use for unprefixed EME only!
 // Returns whether |key_system| is a supported key system.
 // Note: Shouldn't be used for prefixed API as the original
 // IsSupportedKeySystemWithMediaMimeType() path reports UMAs, but this path does
 // not.
 MEDIA_EXPORT bool IsSupportedKeySystem(const std::string& key_system);
 
 MEDIA_EXPORT bool IsSupportedKeySystemWithInitDataType(
     const std::string& key_system,
     const std::string& init_data_type);
@@ skipping 60 matching lines @@
 
 #if defined(UNIT_TEST)
 // Helper functions to add container/codec types for testing purposes.
 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32 mask);
 MEDIA_EXPORT void AddCodecMask(const std::string& codec, uint32 mask);
 #endif  // defined(UNIT_TEST)
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_KEY_SYSTEMS_H_