Move MediaKeys::Exception to CdmPromise::Exception

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 47 matching lines @@
     case EmeInitDataType::WEBM:
       return cdm::kWebM;
     case EmeInitDataType::UNKNOWN:
       break;
   }
 
   NOTREACHED();
   return cdm::kKeyIds;
 }
 
-MediaKeys::Exception ToMediaExceptionType(cdm::Error error) {
+CdmPromise::Exception ToMediaExceptionType(cdm::Error error) {
   switch (error) {
     case cdm::kNotSupportedError:
-      return MediaKeys::NOT_SUPPORTED_ERROR;
+      return CdmPromise::NOT_SUPPORTED_ERROR;
     case cdm::kInvalidStateError:
-      return MediaKeys::INVALID_STATE_ERROR;
+      return CdmPromise::INVALID_STATE_ERROR;
     case cdm::kInvalidAccessError:
-      return MediaKeys::INVALID_ACCESS_ERROR;
+      return CdmPromise::INVALID_ACCESS_ERROR;
     case cdm::kQuotaExceededError:
-      return MediaKeys::QUOTA_EXCEEDED_ERROR;
+      return CdmPromise::QUOTA_EXCEEDED_ERROR;
     case cdm::kUnknownError:
-      return MediaKeys::UNKNOWN_ERROR;
+      return CdmPromise::UNKNOWN_ERROR;
     case cdm::kClientError:
-      return MediaKeys::CLIENT_ERROR;
+      return CdmPromise::CLIENT_ERROR;
     case cdm::kOutputError:
-      return MediaKeys::OUTPUT_ERROR;
+      return CdmPromise::OUTPUT_ERROR;
   }
 
   NOTREACHED() << "Unexpected cdm::Error " << error;
-  return MediaKeys::UNKNOWN_ERROR;
+  return CdmPromise::UNKNOWN_ERROR;
 }
 
 MediaKeys::MessageType ToMediaMessageType(cdm::MessageType message_type) {
   switch (message_type) {
     case cdm::kLicenseRequest:
       return MediaKeys::LICENSE_REQUEST;
     case cdm::kLicenseRenewal:
       return MediaKeys::LICENSE_RENEWAL;
     case cdm::kLicenseRelease:
       return MediaKeys::LICENSE_RELEASE;
@@ skipping 315 matching lines @@
 
   DVLOG(1) << "CDM instance for " + key_system + (cdm ? "" : " could not be") +
                   " created.";
   return cdm;
 }
 
 void CdmAdapter::Initialize(const base::FilePath& cdm_path,
                             std::unique_ptr<media::SimpleCdmPromise> promise) {
   cdm_.reset(CreateCdmInstance(key_system_, cdm_path));
   if (!cdm_) {
-    promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0,
+    promise->reject(CdmPromise::INVALID_ACCESS_ERROR, 0,
                     "Unable to create CDM.");
     return;
   }
 
   cdm_->Initialize(cdm_config_.allow_distinctive_identifier,
                    cdm_config_.allow_persistent_state);
   promise->resolve();
 }
 
 void CdmAdapter::SetServerCertificate(
     const std::vector<uint8_t>& certificate,
     std::unique_ptr<SimpleCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (certificate.size() < limits::kMinCertificateLength ||
       certificate.size() > limits::kMaxCertificateLength) {
-    promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0,
+    promise->reject(CdmPromise::INVALID_ACCESS_ERROR, 0,
                     "Incorrect certificate.");
     return;
   }
 
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
   cdm_->SetServerCertificate(promise_id, certificate.data(),
                              certificate.size());
 }
 
 void CdmAdapter::CreateSessionAndGenerateRequest(
@@ skipping 488 matching lines @@
     result_frames->push_back(frame);
 
     data += frame_size;
     bytes_left -= frame_size;
   } while (bytes_left > 0);
 
   return true;
 }
 
 }  // namespace media