Remove GetUsableKeyIds()

As this was never called from blink, and is no longer part of the EME
spec, removing this functionality.

BUG=428384
TEST=existing EME tests pass

Review URL: https://codereview.chromium.org/814083002

Cr-Commit-Position: refs/heads/master@{#309279}

5 files changed, 0 insertions, 29 deletions

diff --git a/media/blink/cdm_result_promise.h b/media/blink/cdm_result_promise.h
index e59ea1c..57313df 100644
--- a/media/blink/cdm_result_promise.h
+++ b/media/blink/cdm_result_promise.h
@@ -65,14 +65,6 @@ inline void CdmResultPromise<>::resolve() {
   web_cdm_result_.complete();
 }
 
-template <>
-inline void CdmResultPromise<media::KeyIdsVector>::resolve(
-    const media::KeyIdsVector& result) {
-  // TODO(jrummell): Update blink::WebContentDecryptionModuleResult to
-  // handle the set of keys.
-  reject(media::MediaKeys::NOT_SUPPORTED_ERROR, 0, "Not implemented.");
-}
-
 template <typename... T>
 void CdmResultPromise<T...>::reject(media::MediaKeys::Exception exception_code,
                                     uint32 system_code,
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index 43ce395..9b79ddb 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -121,12 +121,6 @@ void CdmSessionAdapter::RemoveSession(
   media_keys_->RemoveSession(web_session_id, promise.Pass());
 }
 
-void CdmSessionAdapter::GetUsableKeyIds(
-    const std::string& web_session_id,
-    scoped_ptr<KeyIdsPromise> promise) {
-  media_keys_->GetUsableKeyIds(web_session_id, promise.Pass());
-}
-
 CdmContext* CdmSessionAdapter::GetCdmContext() {
   return media_keys_->GetCdmContext();
 }
diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h
index bfb5690..2f3ee87 100644
--- a/media/blink/cdm_session_adapter.h
+++ b/media/blink/cdm_session_adapter.h
@@ -83,11 +83,6 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
   void RemoveSession(const std::string& web_session_id,
                      scoped_ptr<SimpleCdmPromise> promise);
 
-  // Retrieves the key IDs for keys in the session that the CDM knows are
-  // currently usable to decrypt media data.
-  void GetUsableKeyIds(const std::string& web_session_id,
-                       scoped_ptr<KeyIdsPromise> promise);
-
   // Returns the CdmContext associated with |media_keys_|.
   // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
   // after WebContentDecryptionModule is freed. http://crbug.com/330324
diff --git a/media/blink/webcontentdecryptionmodulesession_impl.cc b/media/blink/webcontentdecryptionmodulesession_impl.cc
index 74c117d..061ee1f 100644
--- a/media/blink/webcontentdecryptionmodulesession_impl.cc
+++ b/media/blink/webcontentdecryptionmodulesession_impl.cc
@@ -140,15 +140,6 @@ void WebContentDecryptionModuleSessionImpl::remove(
                               new CdmResultPromise<>(result, std::string())));
 }
 
-void WebContentDecryptionModuleSessionImpl::getUsableKeyIds(
-    blink::WebContentDecryptionModuleResult result) {
-  DCHECK(!web_session_id_.empty());
-  adapter_->GetUsableKeyIds(
-      web_session_id_,
-      scoped_ptr<KeyIdsPromise>(
-          new CdmResultPromise<KeyIdsVector>(result, std::string())));
-}
-
 void WebContentDecryptionModuleSessionImpl::release(
     blink::WebContentDecryptionModuleResult result) {
   close(result);
diff --git a/media/blink/webcontentdecryptionmodulesession_impl.h b/media/blink/webcontentdecryptionmodulesession_impl.h
index ac2a1e9f..423619a 100644
--- a/media/blink/webcontentdecryptionmodulesession_impl.h
+++ b/media/blink/webcontentdecryptionmodulesession_impl.h
@@ -50,7 +50,6 @@ class WebContentDecryptionModuleSessionImpl
                       blink::WebContentDecryptionModuleResult result);
   virtual void close(blink::WebContentDecryptionModuleResult result);
   virtual void remove(blink::WebContentDecryptionModuleResult result);
-  virtual void getUsableKeyIds(blink::WebContentDecryptionModuleResult result);
 
   // TODO(jrummell): Remove the next method once blink updated.
   virtual void release(blink::WebContentDecryptionModuleResult result);