Reland r210741 "Separate DemuxerStream and VideoDecoder."

media/base/mock_filters.h

 // 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.
 
 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
 #define MEDIA_BASE_MOCK_FILTERS_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 26 matching lines @@
   MOCK_METHOD0(OnAudioRendererDisabled, void());
   MOCK_METHOD1(GetStream, DemuxerStream*(DemuxerStream::Type));
   MOCK_CONST_METHOD0(GetStartTime, base::TimeDelta());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemuxer);
 };
 
 class MockDemuxerStream : public DemuxerStream {
  public:
-  MockDemuxerStream(DemuxerStream::Type type);
+  explicit MockDemuxerStream(DemuxerStream::Type type);
   virtual ~MockDemuxerStream();
 
   // DemuxerStream implementation.
   virtual Type type() OVERRIDE;
   MOCK_METHOD1(Read, void(const ReadCB& read_cb));
   virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
   virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
   MOCK_METHOD0(EnableBitstreamConverter, void());
 
   void set_audio_decoder_config(const AudioDecoderConfig& config);
   void set_video_decoder_config(const VideoDecoderConfig& config);
 
  private:
   DemuxerStream::Type type_;
   AudioDecoderConfig audio_decoder_config_;
   VideoDecoderConfig video_decoder_config_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
 };
 
 class MockVideoDecoder : public VideoDecoder {
  public:
   MockVideoDecoder();
   virtual ~MockVideoDecoder();
 
   // VideoDecoder implementation.
-  MOCK_METHOD3(Initialize, void(DemuxerStream*,
+  MOCK_METHOD3(Initialize, void(const VideoDecoderConfig& config,
                                 const PipelineStatusCB&,
                                 const StatisticsCB&));
-  MOCK_METHOD1(Read, void(const ReadCB&));
+  MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,
+                            const ReadCB&));
   MOCK_METHOD1(Reset, void(const base::Closure&));
   MOCK_METHOD1(Stop, void(const base::Closure&));
   MOCK_CONST_METHOD0(HasAlpha, bool());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoDecoder);
 };
 
 class MockAudioDecoder : public AudioDecoder {
  public:
@@ skipping 102 matching lines @@
  public:
   MockStatisticsCB();
   ~MockStatisticsCB();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_