EME: Remove obsolete legacy APIs related to versions of prefixed EME

media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

 // Copyright 2013 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.
 
 package org.chromium.media;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.MediaCrypto;
 import android.media.MediaDrm;
@@ skipping 894 matching lines @@
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             requestType = request.getRequestType();
         } else {
             // Prior to M, getRequestType() is not supported. Do our best guess here: Assume
             // requests with a URL are renewals and all others are initial requests.
             requestType = request.getDefaultUrl().isEmpty()
                     ? MediaDrm.KeyRequest.REQUEST_TYPE_INITIAL
                     : MediaDrm.KeyRequest.REQUEST_TYPE_RENEWAL;
         }
 
-        nativeOnSessionMessage(mNativeMediaDrmBridge, sessionId, requestType, request.getData(),
-                request.getDefaultUrl());
+        nativeOnSessionMessage(mNativeMediaDrmBridge, sessionId, requestType, request.getData());
     }
 
     private void onSessionClosed(final byte[] sessionId) {
         if (isNativeMediaDrmBridgeValid()) {
             nativeOnSessionClosed(mNativeMediaDrmBridge, sessionId);
         }
     }
 
     private void onSessionKeysChange(
             final byte[] sessionId, final Object[] keysInfo, final boolean hasAdditionalUsableKey) {
         if (isNativeMediaDrmBridgeValid()) {
             nativeOnSessionKeysChange(
                     mNativeMediaDrmBridge, sessionId, keysInfo, hasAdditionalUsableKey);
         }
     }
 
     private void onSessionExpirationUpdate(final byte[] sessionId, final long expirationTime) {
         if (isNativeMediaDrmBridgeValid()) {
             nativeOnSessionExpirationUpdate(mNativeMediaDrmBridge, sessionId, expirationTime);
         }
     }
 
-    private void onLegacySessionError(final byte[] sessionId, final String errorMessage) {
-        if (isNativeMediaDrmBridgeValid()) {
-            nativeOnLegacySessionError(mNativeMediaDrmBridge, sessionId, errorMessage);
-        }
-    }
-
     private void onResetDeviceCredentialsCompleted(final boolean success) {
         if (isNativeMediaDrmBridgeValid()) {
             nativeOnResetDeviceCredentialsCompleted(mNativeMediaDrmBridge, success);
         }
     }
 
     @MainDex
     private class EventListener implements MediaDrm.OnEventListener {
         @Override
         public void onEvent(
@@ skipping 17 matching lines @@
                     try {
                         request = getKeyRequest(sessionId, data, mime, null);
                     } catch (android.media.NotProvisionedException e) {
                         Log.e(TAG, "Device not provisioned", e);
                         startProvisioning();
                         return;
                     }
                     if (request != null) {
                         onSessionMessage(sessionId, request);
                     } else {
-                        onLegacySessionError(sessionId,
-                                "MediaDrm EVENT_KEY_REQUIRED: Failed to generate request.");
                         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                             onSessionKeysChange(sessionId,
                                     getDummyKeysInfo(MediaDrm.KeyStatus.STATUS_INTERNAL_ERROR)
                                             .toArray(),
                                     false);
                         }
                         Log.e(TAG, "EventListener: getKeyRequest failed.");
                         return;
                     }
                     break;
                 case MediaDrm.EVENT_KEY_EXPIRED:
                     Log.d(TAG, "MediaDrm.EVENT_KEY_EXPIRED");
-                    onLegacySessionError(sessionId, "MediaDrm EVENT_KEY_EXPIRED.");
                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                         onSessionKeysChange(sessionId,
                                 getDummyKeysInfo(MediaDrm.KeyStatus.STATUS_EXPIRED).toArray(),
                                 false);
                     }
                     break;
                 case MediaDrm.EVENT_VENDOR_DEFINED:
                     Log.d(TAG, "MediaDrm.EVENT_VENDOR_DEFINED");
                     assert false;  // Should never happen.
                     break;
@@ skipping 41 matching lines @@
 
     private native void nativeOnStartProvisioning(
             long nativeMediaDrmBridge, String defaultUrl, byte[] requestData);
 
     private native void nativeOnPromiseResolved(long nativeMediaDrmBridge, long promiseId);
     private native void nativeOnPromiseResolvedWithSession(
             long nativeMediaDrmBridge, long promiseId, byte[] sessionId);
     private native void nativeOnPromiseRejected(
             long nativeMediaDrmBridge, long promiseId, String errorMessage);
 
-    private native void nativeOnSessionMessage(long nativeMediaDrmBridge, byte[] sessionId,
-            int requestType, byte[] message, String destinationUrl);
+    private native void nativeOnSessionMessage(
+            long nativeMediaDrmBridge, byte[] sessionId, int requestType, byte[] message);
     private native void nativeOnSessionClosed(long nativeMediaDrmBridge, byte[] sessionId);
     private native void nativeOnSessionKeysChange(long nativeMediaDrmBridge, byte[] sessionId,
             Object[] keysInfo, boolean hasAdditionalUsableKey);
     private native void nativeOnSessionExpirationUpdate(
             long nativeMediaDrmBridge, byte[] sessionId, long expirationTime);
-    private native void nativeOnLegacySessionError(
-            long nativeMediaDrmBridge, byte[] sessionId, String errorMessage);
 
     private native void nativeOnResetDeviceCredentialsCompleted(
             long nativeMediaDrmBridge, boolean success);
 }