media: Rename MediaKeys to ContentDecryptionModule

media/cdm/cdm_adapter.cc

 // Copyright 2015 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.
 
 #include "media/cdm/cdm_adapter.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "media/cdm/cdm_allocator.h"
 #include "media/cdm/cdm_file_io.h"
 #include "media/cdm/cdm_helpers.h"
 #include "media/cdm/cdm_wrapper.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace media {
 
 namespace {
 
-cdm::SessionType ToCdmSessionType(MediaKeys::SessionType session_type) {
+cdm::SessionType ToCdmSessionType(
+    ContentDecryptionModule::SessionType session_type) {
   switch (session_type) {
-    case MediaKeys::TEMPORARY_SESSION:
+    case ContentDecryptionModule::TEMPORARY_SESSION:
       return cdm::kTemporary;
-    case MediaKeys::PERSISTENT_LICENSE_SESSION:
+    case ContentDecryptionModule::PERSISTENT_LICENSE_SESSION:
       return cdm::kPersistentLicense;
-    case MediaKeys::PERSISTENT_RELEASE_MESSAGE_SESSION:
+    case ContentDecryptionModule::PERSISTENT_RELEASE_MESSAGE_SESSION:
       return cdm::kPersistentKeyRelease;
   }
 
   NOTREACHED() << "Unexpected SessionType " << session_type;
   return cdm::kTemporary;
 }
 
 cdm::InitDataType ToCdmInitDataType(EmeInitDataType init_data_type) {
   switch (init_data_type) {
     case EmeInitDataType::CENC:
@@ skipping 25 matching lines @@
     case cdm::kClientError:
       return CdmPromise::CLIENT_ERROR;
     case cdm::kOutputError:
       return CdmPromise::OUTPUT_ERROR;
   }
 
   NOTREACHED() << "Unexpected cdm::Error " << error;
   return CdmPromise::UNKNOWN_ERROR;
 }
 
-MediaKeys::MessageType ToMediaMessageType(cdm::MessageType message_type) {
+ContentDecryptionModule::MessageType ToMediaMessageType(
+    cdm::MessageType message_type) {
   switch (message_type) {
     case cdm::kLicenseRequest:
-      return MediaKeys::LICENSE_REQUEST;
+      return ContentDecryptionModule::LICENSE_REQUEST;
     case cdm::kLicenseRenewal:
-      return MediaKeys::LICENSE_RENEWAL;
+      return ContentDecryptionModule::LICENSE_RENEWAL;
     case cdm::kLicenseRelease:
-      return MediaKeys::LICENSE_RELEASE;
+      return ContentDecryptionModule::LICENSE_RELEASE;
   }
 
   NOTREACHED() << "Unexpected cdm::MessageType " << message_type;
-  return MediaKeys::LICENSE_REQUEST;
+  return ContentDecryptionModule::LICENSE_REQUEST;
 }
 
 CdmKeyInformation::KeyStatus ToCdmKeyInformationKeyStatus(
     cdm::KeyStatus status) {
   switch (status) {
     case cdm::kUsable:
       return CdmKeyInformation::USABLE;
     case cdm::kInternalError:
       return CdmKeyInformation::INTERNAL_ERROR;
     case cdm::kExpired:
@@ skipping 827 matching lines @@
     result_frames->push_back(frame);
 
     data += frame_size;
     bytes_left -= frame_size;
   } while (bytes_left > 0);
 
   return true;
 }
 
 }  // namespace media