Update media tests to unprefixed MSE API.

BUG=307107

Review URL: https://codereview.chromium.org/54053007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233420 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/data/media/media_source_utils.js

@@ -44,8 +44,9 @@ function loadMediaSource(mediaFiles, mediaTypes, appendSourceCallbackFn) {
     xhr.open('GET', mediaFile);
     xhr.responseType = 'arraybuffer';
     xhr.addEventListener('load', function(e) {
-      console.log('Appending to buffer ' + mediaFile);
-      srcBuffer.append(new Uint8Array(e.target.response));
+      var onUpdateEnd = function(e) {
+        console.log('End of appending buffer from ' + mediaFile);
+        srcBuffer.removeEventListener('updateend', onUpdateEnd);
         totalAppended++;
         if (totalAppended == mediaFiles.length) {
           if (appendSourceCallbackFn)
@@ -53,11 +54,14 @@ function loadMediaSource(mediaFiles, mediaTypes, appendSourceCallbackFn) {
           else
             mediaSource.endOfStream();
         }
+      };
+      srcBuffer.addEventListener('updateend', onUpdateEnd);
+      srcBuffer.appendBuffer(new Uint8Array(e.target.response));
     });
     xhr.send();
   }
 
-  var mediaSource = new WebKitMediaSource();
-  mediaSource.addEventListener('webkitsourceopen', onSourceOpen);
+  var mediaSource = new MediaSource();
+  mediaSource.addEventListener('sourceopen', onSourceOpen);
   return mediaSource;
 }

chrome/test/data/media/mse_config_change.html

@@ -40,9 +40,9 @@
         xhr.open("GET", MEDIA_2);
         xhr.responseType = 'arraybuffer';
         xhr.addEventListener('load', function(e) {
-          var srcBuffer = mediaSource.sourceBuffers[0];
-          srcBuffer.timestampOffset = APPEND_TIME;
-          srcBuffer.append(new Uint8Array(e.target.response));
+          var onUpdateEnd = function(e) {
+            console.log('Second buffer append ended.');
+            srcBuffer.removeEventListener('updateend', onUpdateEnd);
             mediaSource.endOfStream();
             if (!mediaSource.duration ||
                 Math.abs(mediaSource.duration - TOTAL_DURATION) > DELTA) {
@@ -52,6 +52,12 @@
               return;
             }
             video.play();
+          };
+          console.log('Appending next media source at ' + APPEND_TIME + 'sec.');
+          var srcBuffer = mediaSource.sourceBuffers[0];
+          srcBuffer.addEventListener('updateend', onUpdateEnd);
+          srcBuffer.timestampOffset = APPEND_TIME;
+          srcBuffer.appendBuffer(new Uint8Array(e.target.response));
         });
         xhr.send();
       }

content/test/data/media/media_source_utils.js

@@ -44,8 +44,9 @@ function loadMediaSource(mediaFiles, mediaTypes, appendSourceCallbackFn) {
     xhr.open('GET', mediaFile);
     xhr.responseType = 'arraybuffer';
     xhr.addEventListener('load', function(e) {
-      console.log('Appending to buffer ' + mediaFile);
-      srcBuffer.append(new Uint8Array(e.target.response));
+      var onUpdateEnd = function(e) {
+        console.log('End of appending buffer from ' + mediaFile);
+        srcBuffer.removeEventListener('updateend', onUpdateEnd);
         totalAppended++;
         if (totalAppended == mediaFiles.length) {
           if (appendSourceCallbackFn)
@@ -53,11 +54,14 @@ function loadMediaSource(mediaFiles, mediaTypes, appendSourceCallbackFn) {
           else
             mediaSource.endOfStream();
         }
+      };
+      srcBuffer.addEventListener('updateend', onUpdateEnd);
+      srcBuffer.appendBuffer(new Uint8Array(e.target.response));
     });
     xhr.send();
   }
 
-  var mediaSource = new WebKitMediaSource();
-  mediaSource.addEventListener('webkitsourceopen', onSourceOpen);
+  var mediaSource = new MediaSource();
+  mediaSource.addEventListener('sourceopen', onSourceOpen);
   return mediaSource;
 }

content/test/data/media/mse_config_change.html

@@ -40,9 +40,9 @@
         xhr.open("GET", MEDIA_2);
         xhr.responseType = 'arraybuffer';
         xhr.addEventListener('load', function(e) {
-          var srcBuffer = mediaSource.sourceBuffers[0];
-          srcBuffer.timestampOffset = APPEND_TIME;
-          srcBuffer.append(new Uint8Array(e.target.response));
+          var onUpdateEnd = function(e) {
+            console.log('Second buffer append ended.');
+            srcBuffer.removeEventListener('updateend', onUpdateEnd);
             mediaSource.endOfStream();
             if (!mediaSource.duration ||
                 Math.abs(mediaSource.duration - TOTAL_DURATION) > DELTA) {
@@ -52,6 +52,12 @@
               return;
             }
             video.play();
+          };
+          console.log('Appending next media source at ' + APPEND_TIME + 'sec.');
+          var srcBuffer = mediaSource.sourceBuffers[0];
+          srcBuffer.addEventListener('updateend', onUpdateEnd);
+          srcBuffer.timestampOffset = APPEND_TIME;
+          srcBuffer.appendBuffer(new Uint8Array(e.target.response));
         });
         xhr.send();
       }