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 54efc8a37e690bfb167f7ad77db11a305dd17dec..0bffe56d942725c2df4a6cf64427d28b993f2b5a 100644
--- a/webkit/renderer/media/crypto/proxy_decryptor.h
+++ b/webkit/renderer/media/crypto/proxy_decryptor.h
@@ -55,10 +55,11 @@ class ProxyDecryptor : public media::MediaKeys {
   virtual void CancelKeyRequest(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(
       const std::string& key_system);
   // Callback for cleaning up a Pepper CDM.
   void DestroyHelperPlugin();
@@ -92,9 +93,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_;