Add support for encrypted WebM files as defined in the RFC.

webkit/media/filter_helpers.h

Index: webkit/media/filter_helpers.h
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
index 00e86c635fb2b797180c3dbafce6fabdeaa00bd7..b28063c7cff34a38a1cf16560218e4796256f503 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,

[xhwang, 2012/06/14 19:42:27]

We can keep the use of AesDecryptor (HmacAesDecryptor after renaming) as is if
we don't add a new Decryptor (see other comment about this).

FYI, I am also working on a CL that defines the Decryptor interface and replaces
AesDecryptor with Decryptor in many decryptor access points:

http://codereview.chromium.org/10539150/

I didn't do this earlier because in media stack code, if we only have one
implementation, then we don't play the interface-implementation game. I am doing
this now because we'll have a CdmDecryptor very soon.

     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