Initial implementation of stream switching in AdaptiveDemuxer.

media/base/pipeline_status.h

Index: media/base/pipeline_status.h
diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h
index 3fc222dce479d62b35cd60463a02f2b4a709fb32..ba6b9312d28066aa68ca6082156422891da7c244 100644
--- a/media/base/pipeline_status.h
+++ b/media/base/pipeline_status.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_BASE_PIPELINE_STATUS_H_
 #define MEDIA_BASE_PIPELINE_STATUS_H_
 
+#include "base/callback.h"
 #include "base/callback_old.h"
 
 namespace media {
@@ -34,6 +35,7 @@ enum PipelineStatus {
 };
 
 typedef Callback1<media::PipelineStatus>::Type PipelineStatusCallback;
+typedef base::Callback<void(PipelineStatus)> PipelineStatusCB;

[Ami GONE FROM CHROMIUM, 2011/05/19 20:27:37]

Does filters.h need a separate FilterStatusCB?
Use this type in base/mock_callback.{h,cc} instead of the explicit type?

[acolwell GONE FROM CHROMIUM, 2011/05/20 01:26:37]

No.
Yes.

I'll put this in a separate CL.

 
 }  // namespace media