Update Pepper interface for EME

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 13ee760ad6caff189c8b38e50d5d74d3babe1c1c..32804bcb16f2c8ca94377750753256e4ca028a2e 100644
--- a/media/base/cdm_promise.cc
+++ b/media/base/cdm_promise.cc
@@ -63,6 +63,10 @@ void CdmPromise::reject(MediaKeys::Exception exception_code,
   reject_cb_.Run(exception_code, system_code, error_message);
 }
 
+CdmPromise::PromiseType CdmPromise::Type() {
+  return UNKNOWN_TYPE;

[ddorwin, 2014/08/25 22:55:01]

This is a symptom. Either the value should be provided to the constructor (best)
or this should be a pure virtual base method.

[jrummell, 2014/08/26 00:19:23]

Done.

+}
+
 template <typename T>
 CdmPromiseTemplate<T>::CdmPromiseTemplate(
     base::Callback<void(const T&)> resolve_cb,
@@ -133,6 +137,20 @@ void CdmPromiseTemplate<void>::resolve() {
   resolve_cb_.Run();
 }
 
+CdmPromise::PromiseType CdmPromiseTemplate<void>::Type() {
+  return SIMPLE_TYPE;

[ddorwin, 2014/08/25 22:55:01]

Per previous comments, move these to the constructors.

[jrummell, 2014/08/26 00:19:23]

Since these are templates, hard to do. Changed to represent parameter type.

+}
+
+template <>
+CdmPromise::PromiseType CdmPromiseTemplate<std::string>::Type() {
+  return NEW_SESSION_TYPE;
+}
+
+template <>
+CdmPromise::PromiseType CdmPromiseTemplate<KeyIdsVector>::Type() {
+  return KEY_IDS_TYPE;
+}
+
 // Explicit template instantiation for the Promises needed.
 template class MEDIA_EXPORT CdmPromiseTemplate<std::string>;
 template class MEDIA_EXPORT CdmPromiseTemplate<KeyIdsVector>;