Merge FilterStatusCB into PipelineStatusCB.

content/renderer/media/capture_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 "content/renderer/media/capture_video_decoder.h"
 
 #include "base/bind.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/filter_host.h"
 #include "media/base/limits.h"
@@ skipping 65 matching lines @@
 }
 
 void CaptureVideoDecoder::Stop(const base::Closure& callback) {
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&CaptureVideoDecoder::StopOnDecoderThread,
                  this, 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,
                  this, time, cb));
 }
 
 void CaptureVideoDecoder::OnStarted(media::VideoCapture* capture) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 83 matching lines @@
 }
 
 void CaptureVideoDecoder::StopOnDecoderThread(const base::Closure& callback) {
   DVLOG(1) << "StopOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   pending_stop_cb_ = callback;
   state_ = kStopped;
   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;
 }
 
 void CaptureVideoDecoder::OnStoppedOnDecoderThread(
     media::VideoCapture* capture) {
   DVLOG(1) << "OnStoppedOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   if (!pending_stop_cb_.is_null())
     media::ResetAndRunCB(&pending_stop_cb_);
   vc_manager_->RemoveDevice(video_stream_id_, this);
@@ skipping 70 matching lines @@
   capture->FeedBuffer(buf);
 }
 
 void CaptureVideoDecoder::DeliverFrame(
     const scoped_refptr<media::VideoFrame>& video_frame) {
   // Reset the callback before running to protect against reentrancy.
   ReadCB read_cb = read_cb_;
   read_cb_.Reset();
   read_cb.Run(video_frame);
 }