1;2305;0cRevert 86971 - Move media library AutoTaskRunner to base and rename ScopedTaskRunner.

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2011 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 "media/filters/ffmpeg_audio_decoder.h"
 
+#include "media/base/callback.h"
 #include "media/base/data_buffer.h"
 #include "media/base/limits.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 
 #if !defined(USE_SSE)
 #if defined(__SSE__) || defined(ARCH_CPU_X86_64) || _M_IX86_FP==1
 #define USE_SSE 1
 #else
 #define USE_SSE 0
@@ skipping 15 matching lines @@
       config_(0, CHANNEL_LAYOUT_NONE, 0),
       estimated_next_timestamp_(kNoTimestamp) {
 }
 
 FFmpegAudioDecoder::~FFmpegAudioDecoder() {
 }
 
 void FFmpegAudioDecoder::DoInitialize(DemuxerStream* demuxer_stream,
                                       bool* success,
                                       Task* done_cb) {
-  base::ScopedTaskRunner done_runner(done_cb);
+  AutoTaskRunner done_runner(done_cb);
   *success = false;
 
   AVStream* av_stream = demuxer_stream->GetAVStream();
   if (!av_stream) {
     return;
   }
 
   // Grab the AVStream's codec context and make sure we have sensible values.
   codec_context_ = av_stream->codec;
   int bps = av_get_bits_per_sample_fmt(codec_context_->sample_fmt);
@@ skipping 199 matching lines @@
 base::TimeDelta FFmpegAudioDecoder::CalculateDuration(size_t size) {
   int64 denominator = codec_context_->channels *
       av_get_bits_per_sample_fmt(codec_context_->sample_fmt) / 8 *
       codec_context_->sample_rate;
   double microseconds = size /
       (denominator / static_cast<double>(base::Time::kMicrosecondsPerSecond));
   return base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds));
 }
 
 }  // namespace