Refactor CdmPromise and related classes

media/base/cdm_promise.cc

Index: media/base/cdm_promise.cc
diff --git a/media/base/cdm_promise.cc b/media/base/cdm_promise.cc
index e10776dfd86230c0c4dc7b5216dd93786b9d78b9..9bad06cc0c66c2b599ed5899d20c010961365a5d 100644
--- a/media/base/cdm_promise.cc
+++ b/media/base/cdm_promise.cc
@@ -4,9 +4,7 @@
 
 #include "media/base/cdm_promise.h"
 
-#include "base/bind.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
 
 namespace media {
 
@@ -29,132 +27,115 @@ struct CdmPromiseTraits<KeyIdsVector> {
       CdmPromise::KEY_IDS_VECTOR_TYPE;
 };

[xhwang, 2014/09/29 18:32:58]

You can put CdmPromiseTraits in an anonymous namespace.

[jrummell, 2014/09/29 22:08:39]

Done.

 
-CdmPromise::CdmPromise(ResolveParameterType parameter_type)
-    : parameter_type_(parameter_type), is_pending_(true) {
+CdmPromise::CdmPromise() {
 }
 
-CdmPromise::CdmPromise(ResolveParameterType parameter_type,
-                       PromiseRejectedCB reject_cb)
-    : parameter_type_(parameter_type),
-      reject_cb_(reject_cb),
-      is_pending_(true) {
-  DCHECK(!reject_cb_.is_null());
+CdmPromise::~CdmPromise() {
 }
 
-CdmPromise::CdmPromise(ResolveParameterType parameter_type,
-                       PromiseRejectedCB reject_cb,
-                       const std::string& uma_name)
-    : parameter_type_(parameter_type),
-      reject_cb_(reject_cb),
-      is_pending_(true),
-      uma_name_(uma_name) {
-  DCHECK(!reject_cb_.is_null());
-  DCHECK(!uma_name_.empty());
+template <typename T>
+CdmPromiseTemplate<T>::CdmPromiseTemplate()
+    : CdmPromise() {
 }

[xhwang, 2014/09/29 18:32:58]

nit: will clang-format make this in one line?

[jrummell, 2014/09/29 22:08:39]

File has been run through clang-format.

 
-CdmPromise::~CdmPromise() {
-  DCHECK(!is_pending_);
+template <typename T>
+CdmPromiseTemplate<T>::~CdmPromiseTemplate() {
 }
 
-static CdmPromise::ResultCodeForUMA ConvertExceptionToUMAResult(
-    MediaKeys::Exception exception_code) {
-  switch (exception_code) {
-    case MediaKeys::NOT_SUPPORTED_ERROR:
-      return CdmPromise::NOT_SUPPORTED_ERROR;
-    case MediaKeys::INVALID_STATE_ERROR:
-      return CdmPromise::INVALID_STATE_ERROR;
-    case MediaKeys::INVALID_ACCESS_ERROR:
-      return CdmPromise::INVALID_ACCESS_ERROR;
-    case MediaKeys::QUOTA_EXCEEDED_ERROR:
-      return CdmPromise::QUOTA_EXCEEDED_ERROR;
-    case MediaKeys::UNKNOWN_ERROR:
-      return CdmPromise::UNKNOWN_ERROR;
-    case MediaKeys::CLIENT_ERROR:
-      return CdmPromise::CLIENT_ERROR;
-    case MediaKeys::OUTPUT_ERROR:
-      return CdmPromise::OUTPUT_ERROR;
-  }
+template <typename T>
+void CdmPromiseTemplate<T>::resolve(const T& result) {
+  // This must be overridden in a subclass.
   NOTREACHED();
-  return CdmPromise::UNKNOWN_ERROR;
 }

[xhwang, 2014/09/29 18:32:58]

If resolve is pure virtual we don't need this :)

[jrummell, 2014/09/29 22:08:39]

Done.

 
-void CdmPromise::reject(MediaKeys::Exception exception_code,
-                        uint32 system_code,
-                        const std::string& error_message) {
-  ReportResultToUMA(ConvertExceptionToUMAResult(exception_code));
-  reject_cb_.Run(exception_code, system_code, error_message);
+template <typename T>
+CdmPromise::ResolveParameterType
+CdmPromiseTemplate<T>::GetResolveParameterType() const {
+  return CdmPromiseTraits<T>::kType;
 }
 
-void CdmPromise::ReportResultToUMA(ResultCodeForUMA result) {
-  DCHECK(is_pending_);
-  is_pending_ = false;
-  if (!uma_name_.empty()) {
-    base::LinearHistogram::FactoryGet(
-        uma_name_,
-        1,
-        NUM_RESULT_CODES,
-        NUM_RESULT_CODES + 1,
-        base::HistogramBase::kUmaTargetedHistogramFlag)->Add(result);
-  }
+CdmPromiseTemplate<void>::CdmPromiseTemplate() : CdmPromise() {
 }
 
-template <typename T>
-CdmPromiseTemplate<T>::CdmPromiseTemplate(
-    base::Callback<void(const T&)> resolve_cb,
-    PromiseRejectedCB reject_cb)
-    : CdmPromise(CdmPromiseTraits<T>::kType, reject_cb),
-      resolve_cb_(resolve_cb) {
-  DCHECK(!resolve_cb_.is_null());
+CdmPromiseTemplate<void>::~CdmPromiseTemplate() {
+}
+
+void CdmPromiseTemplate<void>::resolve() {
+  // This must be overridden in a subclass.
+  NOTREACHED();
+}

[xhwang, 2014/09/29 18:32:58]

ditto

[jrummell, 2014/09/29 22:08:39]

Done.

+
+CdmPromise::ResolveParameterType
+CdmPromiseTemplate<void>::GetResolveParameterType() const {
+  return CdmPromiseTraits<void>::kType;
 }
 
 template <typename T>
-CdmPromiseTemplate<T>::CdmPromiseTemplate(
+CdmCallbackPromise<T>::CdmCallbackPromise(
     base::Callback<void(const T&)> resolve_cb,
-    PromiseRejectedCB reject_cb,
-    const std::string& uma_name)
-    : CdmPromise(CdmPromiseTraits<T>::kType, reject_cb, uma_name),
-      resolve_cb_(resolve_cb) {
+    PromiseRejectedCB reject_cb)
+    : CdmPromiseTemplate<T>(),
+      resolve_cb_(resolve_cb),
+      reject_cb_(reject_cb),
+      is_pending_(true) {
   DCHECK(!resolve_cb_.is_null());
+  DCHECK(!reject_cb_.is_null());
 }
 
 template <typename T>
-CdmPromiseTemplate<T>::CdmPromiseTemplate()
-    : CdmPromise(CdmPromiseTraits<T>::kType) {
+CdmCallbackPromise<T>::~CdmCallbackPromise() {
+  DCHECK(!is_pending_);
 }
 
 template <typename T>
-void CdmPromiseTemplate<T>::resolve(const T& result) {
-  ReportResultToUMA(SUCCESS);
+void CdmCallbackPromise<T>::resolve(const T& result) {
+  DCHECK(is_pending_);
+  is_pending_ = false;
   resolve_cb_.Run(result);
 }
 
-CdmPromiseTemplate<void>::CdmPromiseTemplate(base::Callback<void()> resolve_cb,
-                                             PromiseRejectedCB reject_cb)
-    : CdmPromise(CdmPromiseTraits<void>::kType, reject_cb),
-      resolve_cb_(resolve_cb) {
-  DCHECK(!resolve_cb_.is_null());
+template <typename T>
+void CdmCallbackPromise<T>::reject(MediaKeys::Exception exception_code,
+                                   uint32 system_code,
+                                   const std::string& error_message) {
+  DCHECK(is_pending_);
+  is_pending_ = false;
+  reject_cb_.Run(exception_code, system_code, error_message);
 }
 
-CdmPromiseTemplate<void>::CdmPromiseTemplate(base::Callback<void()> resolve_cb,
-                                             PromiseRejectedCB reject_cb,
-                                             const std::string& uma_name)
-    : CdmPromise(CdmPromiseTraits<void>::kType, reject_cb, uma_name),
-      resolve_cb_(resolve_cb) {
+CdmCallbackPromise<void>::CdmCallbackPromise(
+    base::Callback<void(void)> resolve_cb,
+    PromiseRejectedCB reject_cb)
+    : CdmPromiseTemplate<void>(),
+      resolve_cb_(resolve_cb),
+      reject_cb_(reject_cb),
+      is_pending_(true) {
   DCHECK(!resolve_cb_.is_null());
-  DCHECK(!uma_name_.empty());
+  DCHECK(!reject_cb_.is_null());
 }
 
-CdmPromiseTemplate<void>::CdmPromiseTemplate()
-    : CdmPromise(CdmPromiseTraits<void>::kType) {
+CdmCallbackPromise<void>::~CdmCallbackPromise() {
+  DCHECK(!is_pending_);
 }
 
-void CdmPromiseTemplate<void>::resolve() {
-  ReportResultToUMA(SUCCESS);
+void CdmCallbackPromise<void>::resolve() {
+  DCHECK(is_pending_);
+  is_pending_ = false;
   resolve_cb_.Run();
 }
 
+void CdmCallbackPromise<void>::reject(MediaKeys::Exception exception_code,
+                                      uint32 system_code,
+                                      const std::string& error_message) {
+  DCHECK(is_pending_);
+  is_pending_ = false;
+  reject_cb_.Run(exception_code, system_code, error_message);
+}
+
 // Explicit template instantiation for the Promises needed.
 template class MEDIA_EXPORT CdmPromiseTemplate<std::string>;
 template class MEDIA_EXPORT CdmPromiseTemplate<KeyIdsVector>;
+template class MEDIA_EXPORT CdmCallbackPromise<std::string>;
+template class MEDIA_EXPORT CdmCallbackPromise<KeyIdsVector>;
 
 }  // namespace media