Move MediaKeys::Exception to CdmPromise::Exception

media/mojo/services/mojo_cdm_promise.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/services/mojo_cdm_promise.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_keys.h"

[xhwang, 2016/10/24 17:06:14]

remove?

 
 namespace media {
 
 static mojom::CdmPromiseResultPtr GetRejectResult(
-    MediaKeys::Exception exception,
+    CdmPromise::Exception exception,
     uint32_t system_code,
     const std::string& error_message) {
   mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New());
   cdm_promise_result->success = false;
   cdm_promise_result->exception = exception;
   cdm_promise_result->system_code = system_code;
   cdm_promise_result->error_message = error_message;
   return cdm_promise_result;
 }
 
@@ skipping 15 matching lines @@
 template <typename... T>
 void MojoCdmPromise<T...>::resolve(const T&... result) {
   MarkPromiseSettled();
   mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New());
   cdm_promise_result->success = true;
   callback_.Run(std::move(cdm_promise_result), result...);
   callback_.Reset();
 }
 
 template <typename... T>
-void MojoCdmPromise<T...>::reject(MediaKeys::Exception exception,
+void MojoCdmPromise<T...>::reject(CdmPromise::Exception exception,
                                   uint32_t system_code,
                                   const std::string& error_message) {
   MarkPromiseSettled();
   callback_.Run(GetRejectResult(exception, system_code, error_message), T()...);
   callback_.Reset();
 }
 
 template class MojoCdmPromise<>;
 template class MojoCdmPromise<std::string>;
 
 }  // namespace media