Merge FilterStatusCB into PipelineStatusCB.

content/renderer/media/capture_video_decoder.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 
 #include "base/time.h"
 #include "content/common/content_export.h"
 #include "media/base/demuxer_stream.h"
@@ skipping 16 matching lines @@
   CaptureVideoDecoder(
       base::MessageLoopProxy* message_loop_proxy,
       media::VideoCaptureSessionId video_stream_id,
       VideoCaptureImplManager* vc_manager,
       const media::VideoCapture::VideoCaptureCapability& capability);
   virtual ~CaptureVideoDecoder();
 
   // Filter implementation.
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time,
-                    const media::FilterStatusCB& cb) OVERRIDE;
+                    const media::PipelineStatusCB& cb) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
 
   // Decoder implementation.
   virtual void Initialize(
       media::DemuxerStream* demuxer_stream,
       const media::PipelineStatusCB& status_cb,
       const media::StatisticsCB& statistics_cb) OVERRIDE;
   virtual void Read(const ReadCB& callback) OVERRIDE;
@@ skipping 17 matching lines @@
 
   enum DecoderState {
     kUnInitialized,
     kNormal,
     kStopped,
     kPaused
   };
 
   void PlayOnDecoderThread(const base::Closure& callback);
   void SeekOnDecoderThread(base::TimeDelta time,
-                           const media::FilterStatusCB& cb);
+                           const media::PipelineStatusCB& cb);
   void PauseOnDecoderThread(const base::Closure& callback);
   void FlushOnDecoderThread(const base::Closure& callback);
   void StopOnDecoderThread(const base::Closure& callback);
 
   void InitializeOnDecoderThread(
       media::DemuxerStream* demuxer_stream,
       const media::PipelineStatusCB& status_cb,
       const media::StatisticsCB& statistics_cb);
   void ReadOnDecoderThread(const ReadCB& callback);
 
@@ skipping 20 matching lines @@
 
   media::VideoCaptureSessionId video_stream_id_;
   media::VideoCapture* capture_engine_;
   base::Time last_frame_timestamp_;
   base::Time start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_