| Index: webkit/media/crypto/key_systems.cc
|
| diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc
|
| index 0ffe95198592fc5cad7d852657c4a8c2212fbe36..04501649651feffe2ac5c8167b243c280f014ccd 100644
|
| --- a/webkit/media/crypto/key_systems.cc
|
| +++ b/webkit/media/crypto/key_systems.cc
|
| @@ -149,13 +149,15 @@ bool CanUseAesDecryptor(const std::string& key_system) {
|
| return CanUseBuiltInAesDecryptor(key_system);
|
| }
|
|
|
| -std::string GetPluginType(const std::string& key_system) {
|
| - for (int i = 0; i < kNumKeySystemToPluginTypeMapping; ++i) {
|
| - if (kKeySystemToPluginTypeMapping[i].key_system == key_system)
|
| - return kKeySystemToPluginTypeMapping[i].plugin_type;
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| +std::string GetPepperType(const std::string& key_system) {
|
| + for (int i = 0; i < kNumKeySystemToPepperTypeMapping; ++i) {
|
| + if (kKeySystemToPepperTypeMapping[i].key_system == key_system)
|
| + return kKeySystemToPepperTypeMapping[i].type;
|
| }
|
|
|
| return std::string();
|
| }
|
| +#endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| } // namespace webkit_media
|
|
|