Generalize AesDecryptor to make it more spec compliant.

media/filters/chunk_demuxer_unittest.cc

Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 6eed52c43c58107e4b293c5ccbce2595a1e785f5..6b55a421fc44eec348bddbce7fc4f9a2a00b2a6f 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -87,7 +87,7 @@ class MockChunkDemuxerClient : public ChunkDemuxerClient {
   // are not supported in mocked methods. Remove this when the issue is fixed.
   // See http://code.google.com/p/googletest/issues/detail?id=395
   MOCK_METHOD2(KeyNeededMock, void(const uint8* init_data, int init_data_size));
-  void KeyNeeded(scoped_array<uint8> init_data, int init_data_size) {
+  void DemuxerKeyNeeded(scoped_array<uint8> init_data, int init_data_size) {
     KeyNeededMock(init_data.get(), init_data_size);
   }
 
@@ -744,7 +744,7 @@ TEST_F(ChunkDemuxerTest, TestNetworkErrorEndOfStream) {
 // Read() behavior.
 class EndOfStreamHelper {
  public:
-  EndOfStreamHelper(const scoped_refptr<Demuxer> demuxer)
+  explicit EndOfStreamHelper(const scoped_refptr<Demuxer> demuxer)
       : demuxer_(demuxer),
         audio_read_done_(false),
         video_read_done_(false) {