EME: Fail requestMediaKeySystemAccess if no capabilities specified

media/blink/key_system_config_selector.cc

 // 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 "media/blink/key_system_config_selector.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 652 matching lines @@
           EmeFeatureRequirement::Required;
     }
   }
 
   // 14. Set the sessionTypes member of accumulated configuration to
   //     session types.
   accumulated_configuration->sessionTypes = session_types;
 
   // 15. If the videoCapabilities and audioCapabilities members in candidate
   //     configuration are both empty, return NotSupported.
-  // TODO(jrummell): Enforce this once the deprecation warning is removed.
-  // See http://crbug.com/616233.
+  if (candidate.videoCapabilities.isEmpty() &&
+      candidate.audioCapabilities.isEmpty()) {
+    return CONFIGURATION_NOT_SUPPORTED;
+  }
 
   // 16. If the videoCapabilities member in candidate configuration is
   //     non-empty:
   std::vector<blink::WebMediaKeySystemMediaCapability> video_capabilities;
   if (!candidate.videoCapabilities.isEmpty()) {
     // 16.1. Let video capabilities be the result of executing the Get
     //       Supported Capabilities for Audio/Video Type algorithm on Video,
     //       candidate configuration's videoCapabilities member, accumulated
     //       configuration, and restrictions.
     // 16.2. If video capabilities is null, return NotSupported.
@@ skipping 261 matching lines @@
 
 void KeySystemConfigSelector::OnPermissionResult(
     std::unique_ptr<SelectionRequest> request,
     bool is_permission_granted) {
   request->was_permission_requested = true;
   request->is_permission_granted = is_permission_granted;
   SelectConfigInternal(std::move(request));
 }
 
 }  // namespace media