PipelineError is dead. Long live PipelineStatus!

media/base/composite_filter.h

Index: media/base/composite_filter.h
diff --git a/media/base/composite_filter.h b/media/base/composite_filter.h
index 5fa8531369380b81215540e3145c5b5e189a1196..a2c8c0939ad7838de7c9503278eaaee08d787e7f 100644
--- a/media/base/composite_filter.h
+++ b/media/base/composite_filter.h
@@ -38,7 +38,7 @@ class CompositeFilter : public Filter {
  protected:
   virtual ~CompositeFilter();
 
-  void SetError(PipelineError error);
+  void SetError(PipelineStatus error);
 
  private:
   class FilterHostImpl;
@@ -89,10 +89,10 @@ class CompositeFilter : public Filter {
   void OnCallSequenceDone();
 
   // Helper function for sending an error to the FilterHost.
-  void SendErrorToHost(PipelineError error);
+  void SendErrorToHost(PipelineStatus error);
 
   // Helper function for handling errors during call sequences.
-  void HandleError(PipelineError error);
+  void HandleError(PipelineStatus error);
 
   // Creates a callback that can be called from any thread, but is guaranteed
   // to call the specified method on the thread associated with this filter.
@@ -130,8 +130,8 @@ class CompositeFilter : public Filter {
   // object.
   scoped_ptr<FilterHostImpl> host_impl_;
 
-  // Error passed in the last SetError() call.
-  PipelineError error_;
+  // PIPELINE_OK, or last error passed to SetError().
+  PipelineStatus status_;
 
   scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_;