Merge FilterStatusCB into PipelineStatusCB.

media/filters/ffmpeg_video_decoder.cc

 // 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.
 
 #include "media/filters/ffmpeg_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 121 matching lines @@
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &FFmpegVideoDecoder::Stop, this, callback));
     return;
   }
 
   ReleaseFFmpegResources();
   state_ = kUninitialized;
   callback.Run();
 }
 
-void FFmpegVideoDecoder::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
+void FFmpegVideoDecoder::Seek(base::TimeDelta time,
+                              const PipelineStatusCB& status_cb) {

[Ami GONE FROM CHROMIUM, 2012/03/17 17:27:11]

s/status_// to match .h file.

[xhwang, 2012/03/17 19:20:52]

Done.

   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
-        &FFmpegVideoDecoder::Seek, this, time, cb));
+        &FFmpegVideoDecoder::Seek, this, time, status_cb));
     return;
   }
 
-  cb.Run(PIPELINE_OK);
+  status_cb.Run(PIPELINE_OK);
 }
 
 void FFmpegVideoDecoder::Pause(const base::Closure& callback) {
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &FFmpegVideoDecoder::Pause, this, callback));
     return;
   }
 
   callback.Run();
@@ skipping 279 matching lines @@
 scoped_refptr<VideoFrame> FFmpegVideoDecoder::AllocateVideoFrame() {
   VideoFrame::Format format = PixelFormatToVideoFormat(codec_context_->pix_fmt);
   size_t width = codec_context_->width;
   size_t height = codec_context_->height;
 
   return VideoFrame::CreateFrame(format, width, height,
                                  kNoTimestamp(), kNoTimestamp());
 }
 
 }  // namespace media