Make mojo renderer capable of supporting multiple streams/tracks

media/mojo/services/demuxer_stream_provider_shim.h

Index: media/mojo/services/demuxer_stream_provider_shim.h
diff --git a/media/mojo/services/demuxer_stream_provider_shim.h b/media/mojo/services/demuxer_stream_provider_shim.h
index b12b2a5bf8086835a1d999f058d49643160b6336..b1b6da9a1a30a33e79ed9530a8ddecefab93e81b 100644
--- a/media/mojo/services/demuxer_stream_provider_shim.h
+++ b/media/mojo/services/demuxer_stream_provider_shim.h
@@ -9,7 +9,6 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/demuxer_stream_provider.h"
 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
@@ -22,8 +21,7 @@ class DemuxerStreamProviderShim : public DemuxerStreamProvider {
   // Constructs the shim; at least a single audio or video stream must be
   // provided.  |demuxer_ready_cb| will be called once the streams have been
   // initialized.  Calling any method before then is an error.
-  DemuxerStreamProviderShim(mojom::DemuxerStreamPtr audio,
-                            mojom::DemuxerStreamPtr video,
+  DemuxerStreamProviderShim(std::vector<mojom::DemuxerStreamPtr> streams,
                             const base::Closure& demuxer_ready_cb);
   ~DemuxerStreamProviderShim() override;
 
@@ -40,11 +38,10 @@ class DemuxerStreamProviderShim : public DemuxerStreamProvider {
   // all streams are ready.
   base::Closure demuxer_ready_cb_;
 
-  // Scoped container for demuxer stream adapters which interface with the
-  // mojo level demuxer streams.  |streams_ready_| tracks how many streams are
-  // ready and is used by OnStreamReady() to know when |demuxer_ready_cb_|
-  // should be fired.
-  ScopedVector<MojoDemuxerStreamAdapter> streams_;
+  // Container for demuxer stream adapters which interface with the mojo level
+  // demuxer streams.  |streams_ready_| tracks how many streams are ready and is
+  // used by OnStreamReady() to know when |demuxer_ready_cb_| should be fired.
+  std::vector<std::unique_ptr<MojoDemuxerStreamAdapter>> streams_;
   size_t streams_ready_;
 
   // WeakPtrFactorys must always be the last member variable.