Add ProxyDecryptor which wraps concrete Decryptor implementations.

webkit/media/webmediaplayer_impl.h

Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index c19e00650251e948868c24e6e66f41d8cf59c3f4..bf1d17b3700e9506cbd332215bbdbdd779060390 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -79,6 +79,7 @@ class MediaLog;
 namespace webkit_media {
 
 class MediaStreamClient;
+class ProxyDecryptor;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerProxy;
 
@@ -292,8 +293,9 @@ class WebMediaPlayerImpl
   scoped_refptr<media::Pipeline> pipeline_;
   bool started_;
 
-  // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<media::Decryptor> decryptor_;
+  // The currently selected key system. Empty string means that no key system
+  // has been selected.
+  WebKit::WebString current_key_system_;
 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
 
@@ -339,6 +341,9 @@ class WebMediaPlayerImpl
 
   bool is_local_source_;
 
+  // The decryptor that manages decryption keys and decrypts encrypted frames.
+  scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;

[scherkus (not reviewing), 2012/06/28 18:32:52]

this doesn't even have to be a scoped_ptr<> :)

[ddorwin, 2012/06/28 22:15:38]

Yes, that's what I was trying to say. Just do:
webkit_media::ProxyDecryptor decryptor_

[xhwang, 2012/06/28 23:31:42]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };