EME: ProxyDecryptor creates MediaKeys instead of Decryptor.

media/base/media_keys.h

Index: media/base/media_keys.h
diff --git a/media/base/media_keys.h b/media/base/media_keys.h
index 14789e23c1880211bcb0e9e453eaec1dfc07eb89..a0720f42b747548569d3caa40f657cdf367a2de1 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -14,6 +14,8 @@
 
 namespace media {
 
+class Decryptor;
+
 // Performs media key operations.
 //
 // All key operations are called on the renderer thread. Therefore, these calls
@@ -59,6 +61,11 @@ class MEDIA_EXPORT MediaKeys {
   virtual void CancelKeyRequest(const std::string& key_system,
                                 const std::string& session_id) = 0;
 
+  // Gets the Decryptor object associated with the MediaKeys. Returns NULL if
+  // no Decryptor object is associated. The returned object is only guaranteed
+  // to be valid during the MediaKeys' lifetime.
+  virtual Decryptor* GetDecryptor();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaKeys);
 };