Revert of Integrate browser tests with new EME player.

chrome/test/data/media/eme_player_js/player.js

Index: chrome/test/data/media/eme_player_js/player.js
diff --git a/chrome/test/data/media/eme_player_js/player.js b/chrome/test/data/media/eme_player_js/player.js
index 206c591910a24e0171e6eacd9b79d285c5f36049..64c3b7bb13714f1dd04276877e3ec9511f9a7d65 100644
--- a/chrome/test/data/media/eme_player_js/player.js
+++ b/chrome/test/data/media/eme_player_js/player.js
@@ -14,13 +14,12 @@
     'webkitneedkey': 'onWebkitNeedKey',
     'webkitkeymessage': 'onWebkitKeyMessage',
     'webkitkeyadded': 'onWebkitKeyAdded',
-    'webkitkeyerror': 'onWebkitKeyError',
     'error': 'onError',
     'abort': 'onAbort'
   };
 
   // List of events that fail tests.
-  var failingEvents = ['error', 'abort'];
+  var failingEvents = ['error', 'onAbort'];
 
   for (eventName in eventListenerMap) {
     video.addEventListener(eventName,
@@ -41,7 +40,7 @@
 }
 
 function InitEMEPlayer(player, video) {
-  video.addEventListener('needkey', function(message) {
+  player.onNeedKey = function(message) {
     Utils.timeLog('Creating new media key session for contentType: ' +
                   message.contentType + ', initData: ' +
                   Utils.getHexString(message.initData));
@@ -49,20 +48,13 @@
       var mediaKeySession = message.target.mediaKeys.createSession(
           message.contentType, message.initData);
       mediaKeySession.addEventListener('message', player.onMessage);
-      mediaKeySession.addEventListener('message', function(message) {
-        video.receivedKeyMessage = true;
-        if (Utils.isHeartBeatMessage(message.message)) {
-          Utils.timeLog('MediaKeySession onMessage - heart beat', message);
-          video.receivedHeartbeat = true;
-        }
-      });
       mediaKeySession.addEventListener('error', function(error) {
-        Utils.failTest(error, KEY_ERROR);
+        Utils.failTest(error);
       });
     } catch (e) {
       Utils.failTest(e);
     }
-  });
+  };
 
   InitPlayer(player, video);
   try {
@@ -74,40 +66,17 @@
 }
 
 function InitPrefixedEMEPlayer(player, video) {
-  video.addEventListener('webkitneedkey', function(message) {
-    var initData = message.initData;
-    if (TestConfig.sessionToLoad) {
-      Utils.timeLog('Loading session: ' + TestConfig.sessionToLoad)
-      initData = Utils.convertToUint8Array(
-          PREFIXED_API_LOAD_SESSION_HEADER + TestConfig.sessionToLoad);
-    }
+  player.onWebkitNeedKey = function(message) {
     Utils.timeLog(TestConfig.keySystem + ' Generate key request, initData: ' +
-                  Utils.getHexString(initData));
-    try {
-      message.target.webkitGenerateKeyRequest(TestConfig.keySystem, initData);
-    } catch(e) {
-      Utils.failTest(e);
-    }
-  });
+                  Utils.getHexString(message.initData));
+    message.target.webkitGenerateKeyRequest(
+        TestConfig.keySystem, message.initData);
+  };
 
-  video.addEventListener('webkitkeyadded', function(message) {
+  player.onWebkitKeyAdded = function(message) {
     Utils.timeLog('onWebkitKeyAdded', message);
-    message.target.receivedKeyAdded = true;
-  });
-
-  video.addEventListener('webkitkeyerror', function(error) {
-    Utils.timeLog('onWebkitKeyError', error);
-    Utils.failTest(error, KEY_ERROR);
-  });
-
-  video.addEventListener('webkitkeymessage', function(message) {
-    Utils.timeLog('onWebkitKeyMessage', message);
-    message.target.receivedKeyMessage = true;
-    if (Utils.isHeartBeatMessage(message.message)) {
-      Utils.timeLog('onWebkitKeyMessage - heart beat', message);
-      message.target.receivedHeartbeat = true;
-    }
-  });
+    message.target.hasKeyAdded = true;
+  };
 
   InitPlayer(player, video);
 }