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 72 matching lines @@
 }
 
 class MockChunkDemuxerClient : public ChunkDemuxerClient {
  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) {
-    KeyNeededMock(init_data.get(), init_data_size);
+  // are not supported in mocked methods. Remove this when the issue is fixed
+  // (http://code.google.com/p/googletest/issues/detail?id=395) or when we use
+  // std::string instead of scoped_array<uint8> (http://crbug.com/130689).
+  MOCK_METHOD2(NeedKeyMock, void(const uint8* init_data, int init_data_size));
+  void DemuxerNeedKey(scoped_array<uint8> init_data, int init_data_size) {
+    NeedKeyMock(init_data.get(), init_data_size);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockChunkDemuxerClient);
 };
 
 class ChunkDemuxerTest : public testing::Test {
  protected:
   enum CodecsIndex {
     AUDIO,
@@ skipping 475 matching lines @@
     bool has_video = (i & 0x2) != 0;
     bool video_content_encoded = (i & 0x4) != 0;
 
     // No test on invalid combination.
     if (!has_video && video_content_encoded)
       continue;
 
     client_.reset(new MockChunkDemuxerClient());
     demuxer_ = new ChunkDemuxer(client_.get());
     if (has_video && video_content_encoded)
-      EXPECT_CALL(*client_, KeyNeededMock(NotNull(), 16));
+      EXPECT_CALL(*client_, NeedKeyMock(NotNull(), 16));
 
     ASSERT_TRUE(InitDemuxer(has_audio, has_video, video_content_encoded));
 
     scoped_refptr<DemuxerStream> audio_stream =
         demuxer_->GetStream(DemuxerStream::AUDIO);
     if (has_audio) {
       ASSERT_TRUE(audio_stream);
 
       const AudioDecoderConfig& config = audio_stream->audio_decoder_config();
       EXPECT_EQ(kCodecVorbis, config.codec());
@@ skipping 285 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 706 matching lines @@
                  NewExpectedStatusCB(PIPELINE_OK));
 
   // Generate a cluster to fulfill this seek, where audio timecode begins 25ms
   // after the video.
   scoped_ptr<Cluster> middle_cluster(GenerateCluster(5025, 5000, 8));
   ASSERT_TRUE(AppendData(middle_cluster->data(), middle_cluster->size()));
   GenerateExpectedReads(5025, 5000, 8, audio, video);
 }
 
 }  // namespace media