Add Decryptor interface.

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 30d15f00a649061163b8b723e94b1445d558d154..c19e00650251e948868c24e6e66f41d8cf59c3f4 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -56,10 +56,10 @@
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/audio_renderer_sink.h"
+#include "media/base/decryptor.h"
 #include "media/base/filters.h"
 #include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
-#include "media/crypto/aes_decryptor.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
@@ -73,7 +73,6 @@ class WebFrame;
 }
 
 namespace media {
-class AesDecryptor;
 class MediaLog;
 }
 
@@ -232,7 +231,7 @@ class WebMediaPlayerImpl
   void OnKeyAdded(const std::string& key_system, const std::string& session_id);
   void OnKeyError(const std::string& key_system,
                   const std::string& session_id,
-                  media::AesDecryptor::KeyError error_code,
+                  media::Decryptor::KeyError error_code,
                   int system_code);
   void OnKeyMessage(const std::string& key_system,
                     const std::string& session_id,
@@ -294,7 +293,7 @@ class WebMediaPlayerImpl
   bool started_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<media::AesDecryptor> decryptor_;
+  scoped_ptr<media::Decryptor> decryptor_;
 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;