Move MediaKeys::Exception to CdmPromise::Exception

media/blink/cdm_result_promise.h

Index: media/blink/cdm_result_promise.h
diff --git a/media/blink/cdm_result_promise.h b/media/blink/cdm_result_promise.h
index 0f7eeb18531bd50ff63a8d1b7e22895641a026f8..8cbe247aabf55ca4897d4835ed5718bf091b051b 100644
--- a/media/blink/cdm_result_promise.h
+++ b/media/blink/cdm_result_promise.h
@@ -8,10 +8,7 @@
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "media/base/cdm_promise.h"
-#include "media/base/media_keys.h"
 #include "media/blink/cdm_result_promise_helper.h"
-#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"

[xhwang, 2016/10/26 00:13:05]

You should keep these headers since they are used in the class declaration.

 #include "third_party/WebKit/public/platform/WebString.h"
 
 namespace media {
@@ -32,7 +29,7 @@ class CdmResultPromise : public CdmPromiseTemplate<T...> {
 
   // CdmPromiseTemplate<T> implementation.
   void resolve(const T&... result) override;
-  void reject(MediaKeys::Exception exception_code,
+  void reject(CdmPromise::Exception exception_code,
               uint32_t system_code,
               const std::string& error_message) override;
 
@@ -72,7 +69,7 @@ inline void CdmResultPromise<>::resolve() {
 }
 
 template <typename... T>
-void CdmResultPromise<T...>::reject(MediaKeys::Exception exception_code,
+void CdmResultPromise<T...>::reject(CdmPromise::Exception exception_code,
                                     uint32_t system_code,
                                     const std::string& error_message) {
   MarkPromiseSettled();