media: Refactor VideoFrameStreamTest

media/filters/decoder_stream.h

 // Copyright 2014 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_FILTERS_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include <deque>
 #include <list>
 #include <memory>
@@ skipping 94 matching lines @@
 
   // Allows callers to register for notification of config changes; this is
   // called immediately after receiving the 'kConfigChanged' status from the
   // DemuxerStream, before any action is taken to handle the config change.
   typedef base::Closure ConfigChangeObserverCB;
   void set_config_change_observer(
       const ConfigChangeObserverCB& config_change_observer) {
     config_change_observer_cb_ = config_change_observer;
   }
 
+  // Allows tests to keep track the currently selected decoder.
+  typedef base::RepeatingCallback<void(Decoder*)> DecoderChangeObserverCB;

[DaleCurtis, 2017/04/26 19:41:14]

using.

[xhwang, 2017/04/27 21:11:14]

Done.

+  void set_decoder_change_observer_for_testing(
+      const DecoderChangeObserverCB& decoder_change_observer_cb) {

[DaleCurtis, 2017/04/26 19:41:14]

I believe std::move() is preferred now.

[xhwang, 2017/04/27 21:11:14]

Done.

+    decoder_change_observer_cb_ = decoder_change_observer_cb;
+  }
+
   int get_pending_buffers_size_for_testing() const {
     return pending_buffers_.size();
   }
 
   int get_fallback_buffers_size_for_testing() const {
     return fallback_buffers_.size();
   }
 
  private:
   enum State {
@@ skipping 75 matching lines @@
   std::unique_ptr<DecoderSelector<StreamType>> decoder_selector_;
 
   std::unique_ptr<Decoder> decoder_;
 
   // Whether |decoder_| has produced a frame yet. Reset on fallback.
   bool decoder_produced_a_frame_;
 
   std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
   ConfigChangeObserverCB config_change_observer_cb_;
+  DecoderChangeObserverCB decoder_change_observer_cb_;
 
   // An end-of-stream buffer has been sent for decoding, no more buffers should
   // be sent for decoding until it completes.
   // TODO(sandersd): Turn this into a State. http://crbug.com/408316
   bool decoding_eos_;
 
   // Decoded buffers that haven't been read yet. Used when the decoder supports
   // parallel decoding.
   std::list<scoped_refptr<Output> > ready_outputs_;
 
@@ skipping 33 matching lines @@
 
 template <>
 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_