media: Refactor VideoFrameStreamTest

media/filters/decoder_stream.h

Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index 28a11ebccc6644dfae8fd6950b9d05d1a8924b65..046a98139ee094d6fbf7cdd029dd474952516520 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -112,6 +112,13 @@ class MEDIA_EXPORT DecoderStream {
     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();
   }
@@ -207,6 +214,7 @@ class MEDIA_EXPORT DecoderStream {
   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.