Add Decryptor interface.

This is in preparation for the ProxyDecryptor and PpapiDecryptor.

BUG=123260
TEST=media_unittests, media layout tests


Review URL: https://chromiumcodereview.appspot.com/10539150

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143030 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 15 insertions, 16 deletions

diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 075ea09..9eaef4b 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -21,7 +21,7 @@ namespace webkit_media {
 static void AddDefaultDecodersToCollection(
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::AesDecryptor* decryptor,
+    media::Decryptor* decryptor,
     scoped_refptr<media::FFmpegVideoDecoder>* ffmpeg_video_decoder) {
   filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
       base::Bind(&media::MessageLoopFactory::GetMessageLoop,
@@ -69,7 +69,7 @@ bool BuildMediaSourceCollection(
     media::ChunkDemuxerClient* client,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::AesDecryptor* decryptor,
+    media::Decryptor* decryptor,
     scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
   if (media_source_url.isEmpty() || url != media_source_url)
     return false;
@@ -85,7 +85,7 @@ void BuildDefaultCollection(
     const scoped_refptr<media::DataSource>& data_source,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::AesDecryptor* decryptor,
+    media::Decryptor* decryptor,
     scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop_factory->GetMessageLoop("PipelineThread"),
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
index 00e86c6..b28063c 100644
--- a/webkit/media/filter_helpers.h
+++ b/webkit/media/filter_helpers.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 
 namespace media {
-class AesDecryptor;
+class Decryptor;
 class ChunkDemuxerClient;
 class DataSource;
 class FFmpegVideoDecoder;
@@ -44,7 +44,7 @@ bool BuildMediaSourceCollection(
     media::ChunkDemuxerClient* client,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::AesDecryptor* decryptor,
+    media::Decryptor* decryptor,
     scoped_refptr<media::FFmpegVideoDecoder>* video_decoder);
 
 // Builds the required filters for handling regular URLs and adds them to
@@ -53,7 +53,7 @@ void BuildDefaultCollection(
     const scoped_refptr<media::DataSource>& data_source,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::AesDecryptor* decryptor,
+    media::Decryptor* decryptor,
     scoped_refptr<media::FFmpegVideoDecoder>* video_decoder);
 
 }  // webkit_media
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 588801c..891398f 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -893,7 +893,7 @@ void WebMediaPlayerImpl::OnNeedKey(const std::string& key_system,
 
 void WebMediaPlayerImpl::OnKeyError(const std::string& key_system,
                                     const std::string& session_id,
-                                    media::AesDecryptor::KeyError error_code,
+                                    media::Decryptor::KeyError error_code,
                                     int system_code) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 30d15f0..c19e006 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_;
 
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index 461f67e..8b2adc1 100644
--- a/webkit/media/webmediaplayer_proxy.cc
+++ b/webkit/media/webmediaplayer_proxy.cc
@@ -245,7 +245,7 @@ void WebMediaPlayerProxy::KeyAdded(const std::string& key_system,
 
 void WebMediaPlayerProxy::KeyError(const std::string& key_system,
                                    const std::string& session_id,
-                                   media::AesDecryptor::KeyError error_code,
+                                   media::Decryptor::KeyError error_code,
                                    int system_code) {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::KeyErrorTask, this, key_system, session_id,
@@ -280,7 +280,7 @@ void WebMediaPlayerProxy::KeyAddedTask(const std::string& key_system,
 
 void WebMediaPlayerProxy::KeyErrorTask(const std::string& key_system,
                                        const std::string& session_id,
-                                       media::AesDecryptor::KeyError error_code,
+                                       media::Decryptor::KeyError error_code,
                                        int system_code) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
index 2416388..0fe84f1 100644
--- a/webkit/media/webmediaplayer_proxy.h
+++ b/webkit/media/webmediaplayer_proxy.h
@@ -11,8 +11,8 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
+#include "media/base/decryptor_client.h"
 #include "media/base/pipeline.h"
-#include "media/crypto/decryptor_client.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/filters/ffmpeg_video_decoder.h"
@@ -112,7 +112,7 @@ class WebMediaPlayerProxy
                         const std::string& session_id) OVERRIDE;
   virtual void KeyError(const std::string& key_system,
                         const std::string& session_id,
-                        media::AesDecryptor::KeyError error_code,
+                        media::Decryptor::KeyError error_code,
                         int system_code) OVERRIDE;
   virtual void KeyMessage(const std::string& key_system,
                           const std::string& session_id,
@@ -157,7 +157,7 @@ class WebMediaPlayerProxy
   // Notify |webmediaplayer_| that a key error occurred.
   void KeyErrorTask(const std::string& key_system,
                     const std::string& session_id,
-                    media::AesDecryptor::KeyError error_code,
+                    media::Decryptor::KeyError error_code,
                     int system_code);
 
   // Notify |webmediaplayer_| that a key message has been generated.