Update Pepper interface for EME

media/base/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/base/cdm_promise.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 
@@ skipping 45 matching lines @@
   is_pending_ = false;
   if (!uma_name_.empty()) {
     ResultCodeForUMA result_code = ConvertExceptionToUMAResult(exception_code);
     base::LinearHistogram::FactoryGet(
         uma_name_, 1, NUM_RESULT_CODES, NUM_RESULT_CODES + 1,
         base::HistogramBase::kUmaTargetedHistogramFlag)->Add(result_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,
     PromiseRejectedCB reject_cb)
     : CdmPromise(reject_cb), resolve_cb_(resolve_cb) {
   DCHECK(!resolve_cb_.is_null());
 }
 
 template <typename T>
 CdmPromiseTemplate<T>::CdmPromiseTemplate(
@@ skipping 50 matching lines @@
   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(SUCCESS);
   }
   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>;
 
 }  // namespace media