diff --git a/chromecast/media/base/key_systems_common.cc b/chromecast/media/base/key_systems_common.cc index cb6a9dbbcdc635..fac5e55200fc02 100644 --- a/chromecast/media/base/key_systems_common.cc +++ b/chromecast/media/base/key_systems_common.cc @@ -6,7 +6,7 @@ #include -#include "media/cdm/key_system_names.h" +#include "media/base/key_system_names.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. @@ -30,7 +30,7 @@ CastKeySystem GetKeySystemByName(const std::string& key_system_name) { } #endif // defined(PLAYREADY_CDM_AVAILABLE) - if (key_system_name.compare(::media::kClearKey) == 0) { + if (::media::IsClearKey(key_system_name)) { return KEY_SYSTEM_CLEAR_KEY; } diff --git a/media/BUILD.gn b/media/BUILD.gn index 238c8dc5340141..a83a588ab6b047 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -94,8 +94,6 @@ component("media") { "cdm/default_cdm_factory.h", "cdm/json_web_key.cc", "cdm/json_web_key.h", - "cdm/key_system_names.cc", - "cdm/key_system_names.h", "cdm/player_tracker_impl.cc", "cdm/player_tracker_impl.h", "cdm/supported_cdm_versions.cc", diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn index 7b523daba69cbf..b825c204180b5c 100644 --- a/media/base/BUILD.gn +++ b/media/base/BUILD.gn @@ -119,11 +119,12 @@ source_set("base") { "encryption_scheme.h", "key_system_info.cc", "key_system_info.h", + "key_system_names.cc", + "key_system_names.h", "key_system_properties.cc", "key_system_properties.h", "key_systems.cc", "key_systems.h", - "key_systems.h", "loopback_audio_converter.cc", "loopback_audio_converter.h", "media.cc", diff --git a/media/cdm/key_system_names.cc b/media/base/key_system_names.cc similarity index 94% rename from media/cdm/key_system_names.cc rename to media/base/key_system_names.cc index bcddaea2043ba9..6fdf44cac9e5e8 100644 --- a/media/cdm/key_system_names.cc +++ b/media/base/key_system_names.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/cdm/key_system_names.h" +#include "media/base/key_system_names.h" namespace media { diff --git a/media/cdm/key_system_names.h b/media/base/key_system_names.h similarity index 66% rename from media/cdm/key_system_names.h rename to media/base/key_system_names.h index 8b231718fffa89..0ba1934a275c65 100644 --- a/media/cdm/key_system_names.h +++ b/media/base/key_system_names.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MEDIA_CDM_KEY_SYSTEM_NAMES_H_ -#define MEDIA_CDM_KEY_SYSTEM_NAMES_H_ +#ifndef MEDIA_BASE_KEY_SYSTEM_NAMES_H_ +#define MEDIA_BASE_KEY_SYSTEM_NAMES_H_ #include @@ -11,13 +11,8 @@ namespace media { -// TODO(jrummell): Change other uses of Clear Key to use this common value. - -// The key system name for Clear Key. -MEDIA_EXPORT extern const char kClearKey[]; - -// The key system name for External Clear Key. -MEDIA_EXPORT extern const char kExternalClearKey[]; +// TODO(jrummell): This file should be folded into key_systems.cc as that is +// the primary user of these functions. http://crbug.com/606579. // Returns true if |key_system| is Clear Key, false otherwise. MEDIA_EXPORT bool IsClearKey(const std::string& key_system); @@ -31,4 +26,4 @@ MEDIA_EXPORT bool IsExternalClearKey(const std::string& key_system); } // namespace media -#endif // MEDIA_CDM_KEY_SYSTEM_NAMES_H_ +#endif // MEDIA_BASE_KEY_SYSTEM_NAMES_H_ diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc index 8be884fef25709..7ccec771b7327f 100644 --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc @@ -17,10 +17,10 @@ #include "base/time/time.h" #include "build/build_config.h" #include "media/base/key_system_info.h" +#include "media/base/key_system_names.h" #include "media/base/key_system_properties.h" #include "media/base/media.h" #include "media/base/media_client.h" -#include "media/cdm/key_system_names.h" #include "media/media_features.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" @@ -169,7 +169,7 @@ static bool IsPotentiallySupportedKeySystem(const std::string& key_system) { // Known and supported key systems. if (key_system == kWidevineKeySystem) return true; - if (key_system == kClearKey) + if (key_system == kClearKeyKeySystem) return true; // External Clear Key is known and supports suffixes for testing. diff --git a/media/blink/webcontentdecryptionmodulesession_impl.cc b/media/blink/webcontentdecryptionmodulesession_impl.cc index 8db343d31295a0..d8ae46335f44b6 100644 --- a/media/blink/webcontentdecryptionmodulesession_impl.cc +++ b/media/blink/webcontentdecryptionmodulesession_impl.cc @@ -12,6 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "media/base/cdm_key_information.h" #include "media/base/cdm_promise.h" +#include "media/base/key_system_names.h" #include "media/base/key_systems.h" #include "media/base/limits.h" #include "media/base/media_keys.h" @@ -19,7 +20,6 @@ #include "media/blink/cdm_session_adapter.h" #include "media/blink/webmediaplayer_util.h" #include "media/cdm/json_web_key.h" -#include "media/cdm/key_system_names.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebEncryptedMediaKeyInformation.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/media/media.gyp b/media/media.gyp index be8ac652e0f9e8..ba963d2f56cc75 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -338,6 +338,8 @@ 'base/encryption_scheme.h', 'base/key_system_info.cc', 'base/key_system_info.h', + 'base/key_system_names.cc', + 'base/key_system_names.h', 'base/key_system_properties.cc', 'base/key_system_properties.h', 'base/key_systems.cc', @@ -483,8 +485,6 @@ 'cdm/default_cdm_factory.h', 'cdm/json_web_key.cc', 'cdm/json_web_key.h', - 'cdm/key_system_names.cc', - 'cdm/key_system_names.h', 'cdm/player_tracker_impl.cc', 'cdm/player_tracker_impl.h', 'cdm/supported_cdm_versions.cc', diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc index 091fb2443871b9..018d57236bf50d 100644 --- a/media/mojo/services/media_apptest.cc +++ b/media/mojo/services/media_apptest.cc @@ -14,7 +14,6 @@ #include "media/base/cdm_config.h" #include "media/base/mock_filters.h" #include "media/base/test_helpers.h" -#include "media/cdm/key_system_names.h" #include "media/mojo/common/media_type_converters.h" #include "media/mojo/interfaces/content_decryption_module.mojom.h" #include "media/mojo/interfaces/decryptor.mojom.h" @@ -33,6 +32,7 @@ namespace media { namespace { #if defined(ENABLE_MOJO_CDM) +const char kClearKeyKeySystem[] = "org.w3.clearkey"; const char kInvalidKeySystem[] = "invalid.key.system"; #endif const char kSecurityOrigin[] = "http://foo.com"; @@ -140,7 +140,7 @@ class MediaAppTest : public shell::test::ApplicationTestBase { #if defined(ENABLE_MOJO_CDM) TEST_F(MediaAppTest, InitializeCdm_Success) { - InitializeCdm(kClearKey, true, 1); + InitializeCdm(kClearKeyKeySystem, true, 1); run_loop_->Run(); }