EME: ProxyDecryptor creates MediaKeys instead of Decryptor.

webkit/renderer/media/crypto/proxy_decryptor.h

Index: webkit/renderer/media/crypto/proxy_decryptor.h
diff --git a/webkit/renderer/media/crypto/proxy_decryptor.h b/webkit/renderer/media/crypto/proxy_decryptor.h
index 629f76fe2eeac750620f6eeb91a8d4b43d97ffac..037da6e8397070b6040df640936fde228589f616 100644
--- a/webkit/renderer/media/crypto/proxy_decryptor.h
+++ b/webkit/renderer/media/crypto/proxy_decryptor.h
@@ -54,10 +54,11 @@ class ProxyDecryptor : public media::MediaKeys {
                                 const std::string& session_id) OVERRIDE;
 
  private:
-  // Helper functions to create decryptors to handle the given |key_system|.
-  scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system);
+  // Helper functions to create MediaKeys to handle the given |key_system|.
+  scoped_ptr<media::MediaKeys> CreateMediaKeys(const std::string& key_system);
+
 #if defined(ENABLE_PEPPER_CDMS)
-  scoped_ptr<media::Decryptor> CreatePpapiDecryptor(
+  scoped_ptr<media::MediaKeys> CreatePpapiDecryptor(

[ddorwin, 2013/06/19 00:14:35]

"Decryptor" is odd in the name now. Should we replace it with "CDM"?

[xhwang, 2013/06/19 04:28:30]

Do we also want to rename AesDecryptor to AesCdm? Probably do renaming in a
separate CL.

       const std::string& key_system);
   // Callback for cleaning up a Pepper CDM.
   void DestroyHelperPlugin();
@@ -94,9 +95,9 @@ class ProxyDecryptor : public media::MediaKeys {
 
   media::DecryptorReadyCB decryptor_ready_cb_;
 
-  // The real decryptor that does decryption for the ProxyDecryptor.
+  // The real MediaKeys that manages key operations for the ProxyDecryptor.
   // This pointer is protected by the |lock_|.
-  scoped_ptr<media::Decryptor> decryptor_;
+  scoped_ptr<media::MediaKeys> media_keys_;
 
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;