Generalize AesDecryptor to make it more spec compliant.

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_demuxer_host.h"
 #include "media/base/test_data_util.h"
@@ skipping 69 matching lines @@
  public:
   MockChunkDemuxerClient() {}
   virtual ~MockChunkDemuxerClient() {}
 
   MOCK_METHOD1(DemuxerOpened, void(ChunkDemuxer* demuxer));
   MOCK_METHOD0(DemuxerClosed, void());
   // TODO(xhwang): This is a workaround of the issue that move-only parameters
   // 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);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockChunkDemuxerClient);
 };
 
 class ChunkDemuxerTest : public testing::Test {
  protected:
   enum CodecsIndex {
@@ skipping 636 matching lines @@
   ASSERT_TRUE(AppendData(cluster->data(), cluster->size()));
 
   EXPECT_CALL(host_, OnDemuxerError(PIPELINE_ERROR_NETWORK));
   demuxer_->EndOfStream(PIPELINE_ERROR_NETWORK);
 }
 
 // Helper class to reduce duplicate code when testing end of stream
 // 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) {
   }
 
   // Request a read on the audio and video streams.
   void RequestReads() {
     EXPECT_FALSE(audio_read_done_);
     EXPECT_FALSE(video_read_done_);
 
@@ skipping 332 matching lines @@
 
   std::vector<std::string> codecs(1);
   codecs[0] = "vp8";
   ASSERT_EQ(demuxer_->AddId(kSourceId, "video/webm", codecs),
             ChunkDemuxer::kOk);
 
   ASSERT_TRUE(AppendInfoTracks(true, true, false));
 }
 
 }  // namespace media