EME: Fail requestMediaKeySystemAccess if no capabilities specified

third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

 // Copyright 2014 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 "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ThrowException.h"
@@ skipping 112 matching lines @@
   // |m_supportedConfigurations| contains any video capability with empty
   // robustness string.
   void checkVideoCapabilityRobustness() const;
 
   // Generate deprecation warning and log UseCounter if configuration
   // contains only container-only contentType strings.
   // TODO(jrummell): Remove once this is no longer allowed.
   // See http://crbug.com/605661.
   void checkEmptyCodecs(const WebMediaKeySystemConfiguration&);
 
-  // Log UseCounter if selected configuration does not have at least one of
-  // 'audioCapabilities' and 'videoCapabilities' non-empty.
-  // TODO(jrummell): Switch to deprecation message once we have data.
-  // See http://crbug.com/616233.
-  void checkCapabilities(const WebMediaKeySystemConfiguration&);
-
   Member<ScriptPromiseResolver> m_resolver;
   const String m_keySystem;
   WebVector<WebMediaKeySystemConfiguration> m_supportedConfigurations;
 };
 
 MediaKeySystemAccessInitializer::MediaKeySystemAccessInitializer(
     ScriptState* scriptState,
     const String& keySystem,
     const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations)
     : m_resolver(ScriptPromiseResolver::create(scriptState)),
@@ skipping 46 matching lines @@
 
 SecurityOrigin* MediaKeySystemAccessInitializer::getSecurityOrigin() const {
   return isExecutionContextValid()
              ? m_resolver->getExecutionContext()->getSecurityOrigin()
              : nullptr;
 }
 
 void MediaKeySystemAccessInitializer::requestSucceeded(
     WebContentDecryptionModuleAccess* access) {
   checkEmptyCodecs(access->getConfiguration());
-  checkCapabilities(access->getConfiguration());
 
   if (!isExecutionContextValid())
     return;
 
   m_resolver->resolve(
       new MediaKeySystemAccess(m_keySystem, WTF::wrapUnique(access)));
   m_resolver.clear();
 }
 
 void MediaKeySystemAccessInitializer::requestNotSupported(
@@ skipping 79 matching lines @@
     Deprecation::countDeprecation(
         m_resolver->getExecutionContext(),
         UseCounter::EncryptedMediaAllSelectedContentTypesMissingCodecs);
   } else {
     UseCounter::count(
         m_resolver->getExecutionContext(),
         UseCounter::EncryptedMediaAllSelectedContentTypesHaveCodecs);
   }
 }
 
-void MediaKeySystemAccessInitializer::checkCapabilities(
-    const WebMediaKeySystemConfiguration& config) {
-  // This is only checking that at least one capability is provided in the
-  // selected configuration, as apps may pass empty capabilities for
-  // compatibility with other implementations.
-  bool atLeastOneAudioCapability = config.audioCapabilities.size() > 0;
-  bool atLeastOneVideoCapability = config.videoCapabilities.size() > 0;
-
-  if (atLeastOneAudioCapability || atLeastOneVideoCapability) {
-    UseCounter::count(m_resolver->getExecutionContext(),
-                      UseCounter::EncryptedMediaCapabilityProvided);
-  } else {
-    Deprecation::countDeprecation(
-        m_resolver->getExecutionContext(),
-        UseCounter::EncryptedMediaCapabilityNotProvided);
-  }
-}
-
 }  // namespace
 
 ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
     ScriptState* scriptState,
     Navigator& navigator,
     const String& keySystem,
     const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations) {
   DVLOG(3) << __func__;
 
   // From https://w3c.github.io/encrypted-media/#requestMediaKeySystemAccess
@@ skipping 55 matching lines @@
   WebEncryptedMediaClient* mediaClient =
       controller->encryptedMediaClient(executionContext);
   mediaClient->requestMediaKeySystemAccess(
       WebEncryptedMediaRequest(initializer));
 
   // 7. Return promise.
   return promise;
 }
 
 }  // namespace blink