Make mojo renderer capable of supporting multiple streams/tracks

media/mojo/services/media_service_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 120 matching lines @@
     mojo_video_stream_.reset(new MojoDemuxerStreamImpl(
         &video_stream_, MakeRequest(&video_stream_proxy)));
 
     mojom::RendererClientAssociatedPtrInfo client_ptr_info;
     renderer_client_binding_.Bind(&client_ptr_info,
                                   renderer_.associated_group());
 
     EXPECT_CALL(*this, OnRendererInitialized(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
-    renderer_->Initialize(std::move(client_ptr_info), nullptr,
-                          std::move(video_stream_proxy), base::nullopt,
-                          base::nullopt,
+    std::vector<mojom::DemuxerStreamPtr> streams;
+    streams.push_back(std::move(video_stream_proxy));
+    renderer_->Initialize(std::move(client_ptr_info), std::move(streams),
+                          base::nullopt, base::nullopt,
                           base::Bind(&MediaServiceTest::OnRendererInitialized,
                                      base::Unretained(this)));
   }
 
   MOCK_METHOD0(ConnectionClosed, void());
 
  protected:
   std::unique_ptr<service_manager::Connection> connection_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
@@ skipping 59 matching lines @@
   // close the connection.
   EXPECT_CALL(*this, ConnectionClosed())
       .Times(Exactly(1))
       .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
   interface_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media