Move MediaKeys::Exception to CdmPromise::Exception

media/base/cdm_promise_adapter.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/base/cdm_promise_adapter.h"
 
 #include <utility>
 
 #include "media/base/media_keys.h"
 
@@ skipping 29 matching lines @@
   CdmPromise::ResolveParameterType expected = CdmPromiseTraits<T...>::kType;
   if (type != expected) {
     NOTREACHED() << "Promise type mismatch: " << type << " vs " << expected;
     return;
   }
 
   static_cast<CdmPromiseTemplate<T...>*>(promise.get())->resolve(result...);
 }
 
 void CdmPromiseAdapter::RejectPromise(uint32_t promise_id,
-                                      MediaKeys::Exception exception_code,
+                                      CdmPromise::Exception exception_code,
                                       uint32_t system_code,
                                       const std::string& error_message) {
   std::unique_ptr<CdmPromise> promise = TakePromise(promise_id);
   if (!promise) {
     NOTREACHED() << "No promise found for promise_id " << promise_id;
     return;
   }
 
   promise->reject(exception_code, system_code, error_message);
 }
 
 void CdmPromiseAdapter::Clear() {
   // Reject all outstanding promises.
   DCHECK(thread_checker_.CalledOnValidThread());
   for (auto& promise : promises_)
-    promise.second->reject(MediaKeys::UNKNOWN_ERROR, 0, "Operation aborted.");
+    promise.second->reject(CdmPromise::UNKNOWN_ERROR, 0, "Operation aborted.");
   promises_.clear();
 }
 
 std::unique_ptr<CdmPromise> CdmPromiseAdapter::TakePromise(
     uint32_t promise_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   PromiseMap::iterator it = promises_.find(promise_id);
   if (it == promises_.end())
     return nullptr;
   return promises_.take_and_erase(it);
 }
 
 // Explicit instantiation of function templates.
 template MEDIA_EXPORT void CdmPromiseAdapter::ResolvePromise(uint32_t);
 template MEDIA_EXPORT void CdmPromiseAdapter::ResolvePromise(
     uint32_t,
     const std::string&);
 
 }  // namespace media