Make Demuxer::Stop() synchronous.

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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "media/base/media.h"
@@ skipping 20 matching lines @@
   virtual void OnDemuxerError(media::PipelineStatus error) OVERRIDE {}
   virtual void AddTextStream(media::DemuxerStream* text_stream,
                              const media::TextTrackConfig& config) OVERRIDE {}
   virtual void RemoveTextStream(media::DemuxerStream* text_stream) OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl);
 };
 
 static void QuitLoopWithStatus(base::MessageLoop* message_loop,
-                        media::PipelineStatus status) {
+                               media::PipelineStatus status) {
   CHECK_EQ(status, media::PIPELINE_OK);
   message_loop->PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
 }
 
 static void NeedKey(const std::string& type,
                     const std::vector<uint8>& init_data) {
   VLOG(0) << "File is encrypted.";
 }
 
 typedef std::vector<media::DemuxerStream* > Streams;
@@ skipping 135 matching lines @@
     message_loop.Run();
     StreamReader stream_reader(&demuxer, false);
 
     // Benchmark.
     base::TimeTicks start = base::TimeTicks::HighResNow();
     while (!stream_reader.IsDone()) {
       stream_reader.Read();
     }
     base::TimeTicks end = base::TimeTicks::HighResNow();
     total_time += (end - start).InSecondsF();
-    demuxer.Stop(base::Bind(
-        &QuitLoopWithStatus, &message_loop, PIPELINE_OK));
+    demuxer.Stop();
+    QuitLoopWithStatus(&message_loop, PIPELINE_OK);
     message_loop.Run();
   }
 
   perf_test::PrintResult("demuxer_bench",
                          "",
                          filename,
                          kBenchmarkIterations / total_time,
                          "runs/s",
                          true);
 }
@@ skipping 14 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