| Index: third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
|
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp b/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
|
| index 7f69eda5627dc574eee438ed43365351e18c0330..cdf62ae37efac1062f5736d4622d0202a3102c01 100644
|
| --- a/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
|
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
|
| @@ -67,7 +67,7 @@ static WebMediaKeySystemConfiguration::Requirement convertMediaKeysRequirement(c
|
| return WebMediaKeySystemConfiguration::Requirement::NotAllowed;
|
|
|
| // Everything else gets the default value.
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return WebMediaKeySystemConfiguration::Requirement::Optional;
|
| }
|
|
|
| @@ -147,9 +147,9 @@ MediaKeySystemAccessInitializer::MediaKeySystemAccessInitializer(ScriptState* sc
|
| webConfig.hasVideoCapabilities = true;
|
| webConfig.videoCapabilities = convertCapabilities(config.videoCapabilities());
|
| }
|
| - ASSERT(config.hasDistinctiveIdentifier());
|
| + DCHECK(config.hasDistinctiveIdentifier());
|
| webConfig.distinctiveIdentifier = convertMediaKeysRequirement(config.distinctiveIdentifier());
|
| - ASSERT(config.hasPersistentState());
|
| + DCHECK(config.hasPersistentState());
|
| webConfig.persistentState = convertMediaKeysRequirement(config.persistentState());
|
| if (config.hasSessionTypes()) {
|
| webConfig.hasSessionTypes = true;
|
| @@ -250,7 +250,7 @@ ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
|
| const String& keySystem,
|
| const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations)
|
| {
|
| - WTF_LOG(Media, "NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess()");
|
| + DVLOG(3) << "requestMediaKeySystemAccess()";
|
|
|
| // From https://w3c.github.io/encrypted-media/#requestMediaKeySystemAccess
|
| // When this method is invoked, the user agent must run the following steps:
|
|
|