Move ChunkDemuxer handling from WMPProxy to WMPI and remove ChunkDemuxerClient

media/filters/chunk_demuxer.h

Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index a6118497ea35c41aa64d08236e5689f600ff4677..77cebc25faa3b57b19d3035851c02ae4df1fee28 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -19,7 +19,6 @@
 
 namespace media {
 
-class ChunkDemuxerClient;
 class ChunkDemuxerStream;
 class FFmpegURLProtocol;
 
@@ -33,7 +32,10 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
     kReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
   };
 
-  explicit ChunkDemuxer(ChunkDemuxerClient* client);
+  typedef base::Callback<void(scoped_array<uint8> init_data,
+                              int init_data_size)> NeedKeyCB;
+
+  ChunkDemuxer(const base::Closure& open_cb, const NeedKeyCB& need_key_cb);

[Ami GONE FROM CHROMIUM, 2012/09/12 18:45:34]

doco when callbacks are called

[Ami GONE FROM CHROMIUM, 2012/09/12 18:45:34]

is it easy to see why these are not needed in Demuxer itself (and thus belong in
Initialize() instead of the ctor)?

Put another way, do we want to support EME independent of MSE?

[acolwell GONE FROM CHROMIUM, 2012/09/12 22:03:53]

Done.

[acolwell GONE FROM CHROMIUM, 2012/09/12 22:03:53]

Eventually I believe the need_key_cb could be moved to Initialize(), but I think
that should be a separate CL since it would cause a new set of cascading changes
that aren't really related to getting rid of ChunkDemuxerClient.

 
   // Demuxer implementation.
   virtual void Initialize(DemuxerHost* host,
@@ -160,7 +162,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   State state_;
 
   DemuxerHost* host_;
-  ChunkDemuxerClient* client_;
+  base::Closure open_cb_;
+  NeedKeyCB need_key_cb_;
+
   PipelineStatusCB init_cb_;
   PipelineStatusCB seek_cb_;