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..76313a925867b4ae13fc6540770d4ada34ff8f2d 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;
 
@@ -293,7 +294,11 @@ class WebMediaPlayerImpl
   bool started_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<media::Decryptor> decryptor_;
+  scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;

[ddorwin, 2012/06/27 04:00:08]

This could just be a member - just initialize it in the initializers list.

[xhwang, 2012/06/27 21:41:26]

Done.

+
+  // 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_;