Support multiple media tracks in MSE / ChunkDemuxer

third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-addsourcebuffer.html

Index: third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-addsourcebuffer.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-addsourcebuffer.html b/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-addsourcebuffer.html
index 2fe975473577e630e711e79848d6ac0d7b5f6045..d9d0eb23639f9a3fc3019d6bbd4f11de5fadbdc9 100644
--- a/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-addsourcebuffer.html
+++ b/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-addsourcebuffer.html
@@ -134,24 +134,18 @@
               test.done();
           }, "Test addSourceBuffer() with AAC and H.264 in separate SourceBuffers");
 
-          mediasource_test(function(test, mediaElement, mediaSource)
+          mediasource_testafterdataloaded(function(test, mediaElement, mediaSource, segmentInfo, sourceBuffer, mediaData)
           {
-              var reachedLimit = false;
-
-             // The 20 here is an arbitrary upper limit to make sure the test terminates. This test
-             // assumes that implementations won't support more than 20 SourceBuffers simultaneously.
-             for (var i = 0; i < 20; ++i) {
-                 try {
-                     mediaSource.addSourceBuffer(MediaSourceUtil.AUDIO_VIDEO_TYPE);
-                 } catch(e) {
-                     assert_equals(e.name, "QuotaExceededError");
-                     reachedLimit = true;
-                     break;
-                 }
-             }
-             assert_true(reachedLimit, "Reached SourceBuffer limit.");
-             test.done();
-          }, "Test addSourceBuffer() QuotaExceededError.");
+              sourceBuffer.appendBuffer(mediaData);
+              test.expectEvent(sourceBuffer, "updateend");
+              test.waitForExpectedEvents(function()
+              {
+                  assert_throws({name: "QuotaExceededError"},
+                      function() { mediaSource.addSourceBuffer(MediaSourceUtil.AUDIO_VIDEO_TYPE); },
+                      "addSourceBuffer must throw an exception if the MediaSource has already got some data");
+                  test.done();
+              });
+          }, "Test addSourceBuffer() throws QuotaExceededError after data has been appended.");
         </script>
     </body>
 </html>