Merge FilterStatusCB into PipelineStatusCB.

content/renderer/media/capture_video_decoder.cc

Index: content/renderer/media/capture_video_decoder.cc
diff --git a/content/renderer/media/capture_video_decoder.cc b/content/renderer/media/capture_video_decoder.cc
index 9e1346969407d7dd9e53dcbc8bee6e3c3b8f69a6..aad8ffe3bad40a49e9200d6fb45889be549bc117 100644
--- a/content/renderer/media/capture_video_decoder.cc
+++ b/content/renderer/media/capture_video_decoder.cc
@@ -83,7 +83,7 @@ void CaptureVideoDecoder::Stop(const base::Closure& callback) {
 }
 
 void CaptureVideoDecoder::Seek(base::TimeDelta time,
-                               const media::FilterStatusCB& cb) {
+                               const media::PipelineStatusCB& cb) {
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&CaptureVideoDecoder::SeekOnDecoderThread,
@@ -187,12 +187,13 @@ void CaptureVideoDecoder::StopOnDecoderThread(const base::Closure& callback) {
   capture_engine_->StopCapture(this);
 }
 
-void CaptureVideoDecoder::SeekOnDecoderThread(base::TimeDelta time,
-                                              const media::FilterStatusCB& cb) {
+void CaptureVideoDecoder::SeekOnDecoderThread(
+    base::TimeDelta time,
+    const media::PipelineStatusCB& status_cb) {

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

s/status_// to match the .h file.

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

Done.

   DVLOG(1) << "SeekOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
-  cb.Run(media::PIPELINE_OK);
+  status_cb.Run(media::PIPELINE_OK);
   state_ = kNormal;
 }