media: Rename MediaKeys to ContentDecryptionModule

media/remoting/proto/remoting_rpc_message.proto

 // Copyright 2016 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.
 //
 // Protocol buffer for Media Remoting.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
@@ skipping 242 matching lines @@
     KEY_STATUS_PENDING = 5;
     RELEASED = 6;
   }
 
   optional bytes key_id = 1;
   optional KeyStatus status = 2;
   optional uint32 system_code = 3;
 }
 
 // Should align with ::media::CdmPromise::Exception
-enum MediaKeysException {
+enum CdmException {
   NOT_SUPPORTED_ERROR = 0;
   INVALID_STATE_ERROR = 1;
   INVALID_ACCESS_ERROR = 2;
   QUOTA_EXCEEDED_ERROR = 3;
   UNKNOWN_ERROR = 4;
   CLIENT_ERROR = 5;
   OUTPUT_ERROR = 6;
 }
 
-// Should align with ::media::MediaKeys::MessageType
-enum MediaKeysMessageType {
+// Should align with ::media::ContentDecryptionModule::MessageType
+enum CdmMessageType {
   LICENSE_REQUEST = 0;
   LICENSE_RENEWAL = 1;
   LICENSE_RELEASE = 2;
 }
 
-// Should align with ::media::MediaKeys::SessionType
-enum MediaKeysSessionType {
+// Should align with ::media::ContentDecryptionModule::SessionType
+enum CdmSessionType {
   TEMPORARY_SESSION = 0;
   PERSISTENT_LICENSE_SESSION = 1;
   PERSISTENT_RELEASE_MESSAGE_SESSION = 2;
 };
 
 message RendererInitialize {
   optional int32 client_handle = 1;
   optional int32 audio_demuxer_handle = 2;
   optional int32 video_demuxer_handle = 3;
   optional int32 callback_handle = 4;
@@ skipping 65 matching lines @@
 }
 
 message CdmCreateSessionAndGenerateRequest {
   enum EmeInitDataType {
     UNKNOWN = 0;
     WEBM = 1;
     CENC = 2;
     KEYIDS = 3;
   };
 
-  optional MediaKeysSessionType session_type = 1;
+  optional CdmSessionType session_type = 1;
   optional EmeInitDataType init_data_type = 2;
   optional int32 callback_handle = 3;
   optional bytes init_data = 4;
 }
 
 message CdmLoadSession {
-  optional MediaKeysSessionType session_type = 1;
+  optional CdmSessionType session_type = 1;
   optional string session_id = 2;
   optional int32 callback_handle = 3;
 }
 
 message CdmUpdateSession {
   optional string session_id = 1;
   optional int32 callback_handle = 2;
   optional bytes response = 3;
 }
 
 message CdmCloseSession {
   optional string session_id = 1;
   optional int32 callback_handle = 2;
 }
 
 message CdmRemoveSession {
   optional string session_id = 1;
   optional int32 callback_handle = 2;
 }
 
 message CdmPromise {
   // These two fields are used only for RPC_CDM_INITIALIZE_CALLBACK
   optional int32 cdm_id = 1;
   optional int32 decryptor_handle = 2;
 
   optional string session_id = 3;
   optional bool success = 4;
-  optional MediaKeysException exception = 5;
+  optional CdmException exception = 5;
   optional uint32 system_code = 6;
   optional string error_message = 7;
 }
 
 message CdmClientOnSessionMessage {
   optional string session_id = 1;
-  optional MediaKeysMessageType message_type = 2;
+  optional CdmMessageType message_type = 2;
   optional bytes message = 3;
 }
 
 message CdmClientOnSessionKeysChange {
   optional string session_id = 1;
   optional bool has_additional_usable_key = 2;
   repeated CdmKeyInformation key_information = 3;
 }
 
 message CdmClientOnSessionExpirationUpdate {
@@ skipping 152 matching lines @@
 
     // RPC_CDMC_ONSESSIONMESSAGE
     CdmClientOnSessionMessage cdmclient_onsessionmessage_rpc = 601;
     // RPC_CDMC_ONSESSIONKEYSCHANGE
     CdmClientOnSessionKeysChange cdmclient_onsessionkeychange_rpc = 602;
     // RPC_CDMC_ONSESSIONEXPIRATIONUPDATE
     CdmClientOnSessionExpirationUpdate cdmclient_onsessionexpirationupdate_rpc =
         603;
   };
 }