Update browser tests to support upcoming EME parameter type changes.

media/test/data/eme_player_js/utils.js

 // Copyright 2014 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.
 
 // Utils provide logging functions and other JS functions commonly used by the
 // app and media players.
 var Utils = new function() {
   this.titleChanged = false;
 };
 
@@ skipping 12 matching lines @@
   }
 };
 
 Utils.convertToArray = function(input) {
   if (Array.isArray(input))
     return input;
   return [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 ArrayBuffer or ArrayBufferView. If it already a Uint8Array,

[shadi, 2014/07/24 17:46:51]

s/a/is a

[jrummell, 2014/07/25 19:34:05]

Done.

+  // this will just make a copy of the view.
+  return new Uint8Array(msg);
 };
 
 Utils.createJWKData = function(keyId, key) {
   // JWK routines copied from third_party/WebKit/LayoutTests/media/
   //   encrypted-media/encrypted-media-utils.js
   //
   // Encodes data (Uint8Array) into base64 string without trailing '='.
   // TODO(jrummell): Update once the EME spec is updated to say base64url
   // encoding.
   function base64Encode(data) {
@@ skipping 95 matching lines @@
   for (var i = 0; i < uintArray.length; i++) {
     var hex = uintArray[i].toString(16);
     if (hex.length == 1)
       hex = '0' + hex;
     hex_str += hex;
   }
   return hex_str;
 };
 
 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
     // parsing that data we hard code the initData.
     initData = Utils.convertToUint8Array(KEY_ID);
   }
   return initData;
 };
 
 Utils.hasPrefix = function(msg, prefix) {
   var message = String.fromCharCode.apply(null, msg);
   return message.substring(0, prefix.length) == prefix;
 };
 
 Utils.installTitleEventHandler = function(element, event) {
   element.addEventListener(event, function(e) {
     Utils.setResultInTitle(e.type);
   }, false);
 };
 
 Utils.isHeartBeatMessage = function(msg) {
-  return Utils.hasPrefix(msg, HEART_BEAT_HEADER);
+  return Utils.hasPrefix(Utils.convertToUint8Array(msg), HEART_BEAT_HEADER);
 };
 
 Utils.resetTitleChange = function() {
   this.titleChanged = false;
   document.title = '';
 };
 
 Utils.sendRequest = function(requestType, responseType, message, serverURL,
                              onSuccessCallbackFn, forceInvalidResponse) {
   var requestAttemptCount = 0;
@@ skipping 50 matching lines @@
   var time = Utils.getCurrentTimeString();
   // Log to document.
   Utils.documentLog(arguments[0], time);
   // Log to JS console.
   var logString = time + ' - ';
   for (var i = 0; i < arguments.length; i++) {
     logString += ' ' + arguments[i];
   }
   console.log(logString);
 };