Move MediaKeys::Exception to CdmPromise::Exception

media/mojo/clients/mojo_cdm.cc

 // Copyright 2014 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/mojo/clients/mojo_cdm.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 88 matching lines @@
 void MojoCdm::InitializeCdm(const std::string& key_system,
                             const GURL& security_origin,
                             const media::CdmConfig& cdm_config,
                             std::unique_ptr<CdmInitializedPromise> promise) {
   DVLOG(1) << __FUNCTION__ << ": " << key_system;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // If connection error has happened, fail immediately.
   if (remote_cdm_.encountered_error()) {
     LOG(ERROR) << "Remote CDM encountered error.";
-    promise->reject(NOT_SUPPORTED_ERROR, 0, "Mojo CDM creation failed.");
+    promise->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,
+                    "Mojo CDM creation failed.");
     return;
   }
 
   // Otherwise, set an error handler to catch the connection error.
   remote_cdm_.set_connection_error_handler(
       base::Bind(&MojoCdm::OnConnectionError, base::Unretained(this)));
 
   pending_init_promise_ = std::move(promise);
 
   remote_cdm_->Initialize(
       key_system, security_origin.spec(), mojom::CdmConfig::From(cdm_config),
       base::Bind(&MojoCdm::OnCdmInitialized, base::Unretained(this)));
 }
 
 void MojoCdm::OnConnectionError() {
   LOG(ERROR) << "Remote CDM connection error.";
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // We only handle initial connection error.
   if (!pending_init_promise_)
     return;
 
-  pending_init_promise_->reject(NOT_SUPPORTED_ERROR, 0,
+  pending_init_promise_->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,
                                 "Mojo CDM creation failed.");
   pending_init_promise_.reset();
 }
 
 void MojoCdm::SetServerCertificate(const std::vector<uint8_t>& certificate,
                                    std::unique_ptr<SimpleCdmPromise> promise) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   remote_cdm_->SetServerCertificate(
@@ skipping 190 matching lines @@
     std::unique_ptr<NewSessionCdmPromise> promise,
     mojom::CdmPromiseResultPtr result,
     const std::string& session_id) {
   if (result->success)
     promise->resolve(session_id);
   else
     RejectPromise(std::move(promise), std::move(result));
 }
 
 }  // namespace media