Merge "Add deprecation messages for EME requestMediaKeySystemAccess features"

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 299 matching lines @@
   // 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 {
-    // TODO(jrummell): Switch to deprecation message once we understand
-    // current usage. http://crbug.com/616233.
-    UseCounter::count(m_resolver->getExecutionContext(),
-                      UseCounter::EncryptedMediaCapabilityNotProvided);
+    Deprecation::countDeprecation(
+        m_resolver->getExecutionContext(),
+        UseCounter::EncryptedMediaCapabilityNotProvided);
   }
 }
 
 }  // namespace
 
 ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
     ScriptState* scriptState,
     Navigator& navigator,
     const String& keySystem,
     const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations) {
@@ skipping 59 matching lines @@
   WebEncryptedMediaClient* mediaClient =
       controller->encryptedMediaClient(executionContext);
   mediaClient->requestMediaKeySystemAccess(
       WebEncryptedMediaRequest(initializer));
 
   // 7. Return promise.
   return promise;
 }
 
 }  // namespace blink