Revert "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 <algorithm>
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 105 matching lines @@
 
  private:
   // Returns true if the ExecutionContext is valid, false otherwise.
   bool isExecutionContextValid() const;
 
   // For widevine key system, generate warning and report to UMA if
   // |m_supportedConfigurations| contains any video capability with empty
   // robustness string.
   void checkVideoCapabilityRobustness() const;
 
+  // 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 189 matching lines @@
   WebEncryptedMediaClient* mediaClient =
       controller->encryptedMediaClient(executionContext);
   mediaClient->requestMediaKeySystemAccess(
       WebEncryptedMediaRequest(initializer));
 
   // 7. Return promise.
   return promise;
 }
 
 }  // namespace blink