Replace RunInSeries() and RunInParallel() with CallbackSeries helper class.

media/base/pipeline.h

Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index ce028be1be6b3f1102d4e126f68eaefa8a559d85..89ee8b5f7522dcd9bd468c32b2c7be717a4a8295 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -11,6 +11,7 @@
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "media/base/audio_renderer.h"
+#include "media/base/callback_util.h"
 #include "media/base/demuxer.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
@@ -310,14 +311,12 @@ class MEDIA_EXPORT Pipeline
   // Callbacks executed by filters upon completing initialization.
   void OnFilterInitialize(PipelineStatus status);
 
-  // Callback executed by filters upon completing Play(), Pause(), or Stop().
-  void OnFilterStateTransition();
-
-  // Callback executed by filters upon completing Seek().
-  void OnFilterStateTransitionWithStatus(PipelineStatus status);
+  // Callback executed by filters upon completing Play(), Pause(), Flush(),
+  // Seek() or Stop().
+  void OnFilterStateTransition(PipelineStatus status);
 
   // Callback executed by filters when completing teardown operations.
-  void OnTeardownStateTransition();
+  void OnTeardownStateTransition(PipelineStatus status);
 
   // Callback executed by filters to update statistics.
   void OnUpdateStatistics(const PipelineStatistics& stats);
@@ -415,10 +414,10 @@ class MEDIA_EXPORT Pipeline
 
   // Initiates an asynchronous Pause/Seek/Play/Stop() call sequence executing
   // |done_cb| when completed.
-  void DoPause(const base::Closure& done_cb);
-  void DoFlush(const base::Closure& done_cb);
-  void DoPlay(const base::Closure& done_cb);
-  void DoStop(const base::Closure& done_cb);
+  void DoPause(const PipelineStatusCB& done_cb);
+  void DoFlush(const PipelineStatusCB& done_cb);
+  void DoPlay(const PipelineStatusCB& done_cb);
+  void DoStop(const PipelineStatusCB& done_cb);
 
   // Initiates an asynchronous Seek() and preroll call sequence executing
   // |done_cb| with the final status when completed. If |skip_demuxer_seek| is
@@ -563,6 +562,8 @@ class MEDIA_EXPORT Pipeline
   // reaches "kStarted", at which point it is used & zeroed out.
   base::Time creation_time_;
 
+  scoped_ptr<CallbackSeries> pending_callbacks_;
+
   DISALLOW_COPY_AND_ASSIGN(Pipeline);
 };