Remove MessageLoop::current() from demuxer_perftest.cc.

media/base/demuxer_perftest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 #include <memory>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/media_tracks.h"
 #include "media/base/test_data_util.h"
 #include "media/base/timestamp_constants.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/file_data_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 50 matching lines @@
   void Read();
 
   // Returns true when all streams have reached end of stream.
   bool IsDone();
 
   int number_of_streams() { return static_cast<int>(streams_.size()); }
   const Streams& streams() { return streams_; }
   const std::vector<int>& counts() { return counts_; }
 
  private:
-  void OnReadDone(base::MessageLoop* message_loop,
+  void OnReadDone(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+                  const base::Closure& quit_when_idle_closure,
                   bool* end_of_stream,
                   base::TimeDelta* timestamp,
                   media::DemuxerStream::Status status,
                   const scoped_refptr<media::DecoderBuffer>& buffer);
   int GetNextStreamIndexToRead();
 
   Streams streams_;
   std::vector<bool> end_of_stream_;
   std::vector<base::TimeDelta> last_read_timestamp_;
   std::vector<int> counts_;
@@ skipping 24 matching lines @@
   }
 }
 
 StreamReader::~StreamReader() {}
 
 void StreamReader::Read() {
   int index = GetNextStreamIndexToRead();
   bool end_of_stream = false;
   base::TimeDelta timestamp;
 
-  streams_[index]->Read(base::Bind(
-      &StreamReader::OnReadDone, base::Unretained(this),
-      base::MessageLoop::current(), &end_of_stream, &timestamp));
-  base::RunLoop().Run();
+  base::RunLoop run_loop;
+  streams_[index]->Read(
+      base::Bind(&StreamReader::OnReadDone, base::Unretained(this),
+                 base::ThreadTaskRunnerHandle::Get(),
+                 run_loop.QuitWhenIdleClosure(), &end_of_stream, &timestamp));
+  run_loop.Run();
 
   CHECK(end_of_stream || timestamp != media::kNoTimestamp);
   end_of_stream_[index] = end_of_stream;
   last_read_timestamp_[index] = timestamp;
   counts_[index]++;
 }
 
 bool StreamReader::IsDone() {
   for (size_t i = 0; i < end_of_stream_.size(); ++i) {
     if (!end_of_stream_[i])
       return false;
   }
   return true;
 }
 
 void StreamReader::OnReadDone(
-    base::MessageLoop* message_loop,
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    const base::Closure& quit_when_idle_closure,
     bool* end_of_stream,
     base::TimeDelta* timestamp,
     media::DemuxerStream::Status status,
     const scoped_refptr<media::DecoderBuffer>& buffer) {
   CHECK_EQ(status, media::DemuxerStream::kOk);
   CHECK(buffer.get());
   *end_of_stream = buffer->end_of_stream();
   *timestamp = *end_of_stream ? media::kNoTimestamp : buffer->timestamp();
-  message_loop->task_runner()->PostTask(
-      FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
+  task_runner->PostTask(FROM_HERE, quit_when_idle_closure);
 }
 
 int StreamReader::GetNextStreamIndexToRead() {
   int index = -1;
   for (int i = 0; i < number_of_streams(); ++i) {
     // Ignore streams at EOS.
     if (end_of_stream_[i])
       continue;
 
     // Use a stream if it hasn't been read from yet.
@@ skipping 69 matching lines @@
 #endif
 #if defined(OS_CHROMEOS)
   RunDemuxerBenchmark("bear.flac");
 #endif
 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
   RunDemuxerBenchmark("bear.avi");
 #endif
 }
 
 }  // namespace media