Merge FilterStatusCB into PipelineStatusCB.

media/base/composite_filter.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 MEDIA_BASE_COMPOSITE_FILTER_H_
 #define MEDIA_BASE_COMPOSITE_FILTER_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 21 matching lines @@
 
   // media::Filter methods.
   virtual void set_host(FilterHost* host) OVERRIDE;
   virtual FilterHost* host() OVERRIDE;
   virtual void Play(const base::Closure& play_cb) OVERRIDE;
   virtual void Pause(const base::Closure& pause_cb) OVERRIDE;
   virtual void Flush(const base::Closure& flush_cb) OVERRIDE;
   virtual void Stop(const base::Closure& stop_cb) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
   virtual void Seek(
-      base::TimeDelta time, const FilterStatusCB& seek_cb) OVERRIDE;
+      base::TimeDelta time, const PipelineStatusCB& seek_cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
 
  protected:
   virtual ~CompositeFilter();
 
   void SetError(PipelineStatus error);
 
  private:
   class FilterHostImpl;
 
@@ skipping 50 matching lines @@
   base::Closure NewThreadSafeCallback(void (CompositeFilter::*method)());
 
   // Helper function that indicates whether SetError() calls can be forwarded
   // to the host of this filter.
   bool CanForwardError();
 
   // Checks to see if a Play(), Pause(), Flush(), Stop(), or Seek() operation is
   // pending.
   bool IsOperationPending() const;
 
-  // Called by operations that take a FilterStatusCB instead of a Closure.
-  // TODO: Remove when Closures are replaced by FilterStatusCB.
+  // Called by operations that take a PipelineStatusCB instead of a Closure.
+  // TODO: Remove when Closures are replaced by PipelineStatusCB.
   void OnStatusCB(const base::Closure& callback, PipelineStatus status);
 
   // Vector of the filters added to the composite.
   typedef std::vector<scoped_refptr<Filter> > FilterVector;
   FilterVector filters_;
 
   // Callback for the pending request.
-  // TODO: Remove callback_ when Closures are replaced by FilterStatusCB.
+  // TODO: Remove callback_ when Closures are replaced by PipelineStatusCB.
   base::Closure callback_;
-  FilterStatusCB status_cb_;
+  PipelineStatusCB status_cb_;
 
   // Time parameter for the pending Seek() request.
   base::TimeDelta pending_seek_time_;
 
   // Current state of this filter.
   State state_;
 
   // The index of the filter currently processing a request.
   unsigned int sequence_index_;
 
   // Message loop passed into the constructor.
   MessageLoop* message_loop_;
 
   // FilterHost implementation passed to Filters owned by this
   // object.
   scoped_ptr<FilterHostImpl> host_impl_;
 
   // PIPELINE_OK, or last error passed to SetError().
   PipelineStatus status_;
 
   base::WeakPtrFactory<CompositeFilter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositeFilter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_COMPOSITE_FILTER_H_