2 files changed, 4 insertions, 21 deletions
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index 0c25dff..2daa10c 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -42,16 +42,10 @@ ProxyDecryptor::~ProxyDecryptor() {
   media_keys_.reset();
 }
 
-Decryptor* ProxyDecryptor::GetDecryptor() {
-  return media_keys_ ? media_keys_->GetCdmContext()->GetDecryptor() : NULL;
+CdmContext* ProxyDecryptor::GetCdmContext() {
+  return media_keys_ ? media_keys_->GetCdmContext() : nullptr;
 }
 
-#if defined(ENABLE_BROWSER_CDMS)
-int ProxyDecryptor::GetCdmId() {
-  return media_keys_->GetCdmContext()->GetCdmId();
-}
-#endif
-
 bool ProxyDecryptor::InitializeCDM(CdmFactory* cdm_factory,
                                    const std::string& key_system,
                                    const GURL& security_origin) {
diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h
index 193c6b0..308ee99 100644
--- a/media/cdm/proxy_decryptor.h
+++ b/media/cdm/proxy_decryptor.h
@@ -46,15 +46,8 @@ class MEDIA_EXPORT ProxyDecryptor {
                  const KeyMessageCB& key_message_cb);
   virtual ~ProxyDecryptor();
 
-  // Returns the Decryptor associated with this object. May be NULL if no
-  // Decryptor is associated.
-  Decryptor* GetDecryptor();
-
-#if defined(ENABLE_BROWSER_CDMS)
-  // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
-  // CDM ID is associated, such as when Clear Key is used.
-  int GetCdmId();
-#endif
+  // Returns the CdmContext associated with this object.
+  CdmContext* GetCdmContext();
 
   // Only call this once.
   bool InitializeCDM(CdmFactory* cdm_factory,
@@ -115,10 +108,6 @@ class MEDIA_EXPORT ProxyDecryptor {
 
   bool is_clear_key_;
 
-#if defined(ENABLE_BROWSER_CDMS)
-  int cdm_id_;
-#endif
-
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;