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

media/filters/pipeline_integration_test.cc

Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 54da1d24f0d770b2382ed857294e541e7796b44a..862b227813ddfdcca48dedc5de0dd36c10ed2ef1 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -11,9 +11,9 @@
 
 namespace media {
 
-// Key ID of the video track in test file "bear-320x240-encrypted.webm".
-static const unsigned char kKeyId[] =
-    "\x11\xa5\x18\x37\xc4\x73\x84\x03\xe5\xe6\x57\xed\x8e\x06\xd9\x7c";
+// Key used to encrypt video track in test file "bear-320x240-encrypted.webm".
+static const unsigned char kKey[] =
+    "\x5b\x4e\xe8\xb6\xd0\x7e\x4e\x58\xea\x24\x4c\x40\x13\xfd\xb5\x2d";
 
 static const char* kSourceId = "SourceId";
 
@@ -33,10 +33,10 @@ class MockMediaSource : public ChunkDemuxerClient {
 
   virtual ~MockMediaSource() {}
 
-  void set_decryptor(AesDecryptor* decryptor) {
+  void set_decryptor(Decryptor* decryptor) {
     decryptor_ = decryptor;
   }
-  AesDecryptor* decryptor() const {
+  Decryptor* decryptor() const {
     return decryptor_;
   }
 
@@ -90,12 +90,9 @@ class MockMediaSource : public ChunkDemuxerClient {
 
   virtual void KeyNeeded(scoped_array<uint8> init_data, int init_data_size) {
     DCHECK(init_data.get());
-    DCHECK_EQ(init_data_size, 16);
     DCHECK(decryptor());
-    // In test file bear-320x240-encrypted.webm, the decryption key is equal to
-    // |init_data|.
     decryptor()->AddKey(init_data.get(), init_data_size,
-                        init_data.get(), init_data_size);
+                        kKey, sizeof(kKey) - 1);
   }
 
  private:
@@ -104,7 +101,7 @@ class MockMediaSource : public ChunkDemuxerClient {
   int current_position_;
   int initial_append_size_;
   scoped_refptr<ChunkDemuxer> chunk_demuxer_;
-  AesDecryptor* decryptor_;
+  Decryptor* decryptor_;
 };
 
 class PipelineIntegrationTest