Replace FFmpegDemuxer thread per element with base::TaskScheduler.

media/test/pipeline_integration_test_base.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_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 
 #include <stdint.h>
 #include <memory>
 
 #include "base/md5.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "media/audio/clockless_audio_sink.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/demuxer.h"
 #include "media/base/null_video_sink.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/text_track.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_frame.h"
 #include "media/renderers/video_renderer_impl.h"
@@ skipping 98 matching lines @@
   base::TimeDelta GetAudioTime();
 
   // Sets a callback to handle EME "encrypted" event. Must be called to test
   // potentially encrypted media.
   void set_encrypted_media_init_data_cb(
       const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
     encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
   }
 
  protected:
   base::MessageLoop message_loop_;

[gab, 2017/02/24 01:09:05]

If you feel like cleaning this up: ThreadTaskRunnerHandle::Get() can replace
message_loop_->task_runner() on main thread and MessageLoop::Quit() paradigm
should be replaced by RunLoop()+QuitClosure(), then you can use ML provided by
base::test::ScopedTaskScheduler (soon to become
base::test::ScopedTaskEnvironment for the very reason that it's not strictly for
the scheduler -- yeah kind of midflight...).

[DaleCurtis, 2017/02/24 23:40:29]

Too big of a change to do this in this CL, will poke at it for a followup. The
whole class and subclasses makes repeated use of RunUntilIdle() and bare Run()
calls.

   base::MD5Context md5_context_;
   bool hashing_enabled_;
   bool clockless_playback_;
+  std::unique_ptr<base::test::ScopedTaskScheduler> task_scheduler_;

[gab, 2017/02/24 01:09:06]

Why does it have to be delay initialized?

[DaleCurtis, 2017/02/24 23:40:29]

It's only needed for FFmpegDemuxer; which half of these integration tests don't
use.

[gab, 2017/02/26 18:01:35]

I see, add a comment to that effect on this member?

[DaleCurtis, 2017/02/27 21:26:30]

Done.

   std::unique_ptr<Demuxer> demuxer_;
   std::unique_ptr<DataSource> data_source_;
   std::unique_ptr<PipelineImpl> pipeline_;
   scoped_refptr<NullAudioSink> audio_sink_;
   scoped_refptr<ClocklessAudioSink> clockless_audio_sink_;
   std::unique_ptr<NullVideoSink> video_sink_;
   bool ended_;
   PipelineStatus pipeline_status_;
   Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
   VideoPixelFormat last_video_frame_format_;
@@ skipping 59 matching lines @@
                     const AddTextTrackDoneCB& done_cb));
   MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
   MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size&));
   MOCK_METHOD1(OnVideoOpacityChange, void(bool));
   MOCK_METHOD0(OnVideoAverageKeyframeDistanceUpdate, void());
 };
 
 }  // namespace media
 
 #endif  // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_