Update browser tests to support upcoming EME parameter type changes.

The EME spec is now using ArrayBuffer/ArrayBufferView instead of
Uint8Array as the type for data buffers. Calls from JavaScript
aren't affected as Uint8Array is an ArrayBufferView. However,
"message" events now pass back an ArrayBuffer and the tests expect
Uint8Array. This converts the returned message to a Uint8Array
to keep the code working.

This change works with and without the upcoming changes. If
Uint8Array is passed back, then the result is that another copy of
the view is made.

BUG=358271
TEST=encrypted media browser_tests pass

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

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

media/test/data/eme_player_js/utils.js

@@ -30,11 +30,16 @@ Utils.convertToArray = function(input) {
 };
 
 Utils.convertToUint8Array = function(msg) {
-  var ans = new Uint8Array(msg.length);
-  for (var i = 0; i < msg.length; i++) {
-    ans[i] = msg.charCodeAt(i);
+  if (typeof msg == 'string') {
+    var ans = new Uint8Array(msg.length);
+    for (var i = 0; i < msg.length; i++) {
+      ans[i] = msg.charCodeAt(i);
+    }
+    return ans;
   }
-  return ans;
+  // Assume it is an ArrayBuffer or ArrayBufferView. If it already is a
+  // Uint8Array, this will just make a copy of the view.
+  return new Uint8Array(msg);
 };
 
 Utils.createJWKData = function(keyId, key) {
@@ -150,7 +155,7 @@ Utils.getHexString = function(uintArray) {
 };
 
 Utils.getInitDataFromMessage = function(message, mediaType) {
-  var initData = message.message;
+  var initData = Utils.convertToUint8Array(message.message);
   if (mediaType.indexOf('mp4') != -1) {
     // Temporary hack for Clear Key in v0.1.
     // If content uses mp4, then message.message is PSSH data. Instead of
@@ -172,7 +177,7 @@ Utils.installTitleEventHandler = function(element, event) {
 };
 
 Utils.isHeartBeatMessage = function(msg) {
-  return Utils.hasPrefix(msg, HEART_BEAT_HEADER);
+  return Utils.hasPrefix(Utils.convertToUint8Array(msg), HEART_BEAT_HEADER);
 };
 
 Utils.resetTitleChange = function() {

media/test/data/eme_player_js/widevine_player.js

@@ -32,7 +32,10 @@ WidevinePlayer.prototype.onMessage = function(message) {
     }
 
   }
-  Utils.sendRequest('POST', 'arraybuffer', message.message,
-                    this.testConfig.licenseServerURL, onSuccess,
+  Utils.sendRequest('POST',
+                    'arraybuffer',
+                    Utils.convertToUint8Array(message.message),
+                    this.testConfig.licenseServerURL,
+                    onSuccess,
                     this.testConfig.forceInvalidResponse);
 };