Update Pepper interface for EME

media/base/cdm_promise.h

Index: media/base/cdm_promise.h
diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h
index 14f79f852d149a4a80471e823c873508ec10d8fc..e2b0c3067536d5059acaf25b6ef8e522f10868b2 100644
--- a/media/base/cdm_promise.h
+++ b/media/base/cdm_promise.h
@@ -35,6 +35,12 @@ class MEDIA_EXPORT CdmPromise {
     NUM_RESULT_CODES
   };
 
+  enum ResolveParameterType {
+    VOID_TYPE,
+    STRING_TYPE,
+    KEY_IDS_VECTOR_TYPE
+  };
+
   typedef base::Callback<void(MediaKeys::Exception exception_code,
                               uint32 system_code,
                               const std::string& error_message)>
@@ -50,6 +56,8 @@ class MEDIA_EXPORT CdmPromise {
                       uint32 system_code,
                       const std::string& error_message);
 
+  virtual ResolveParameterType resolveParameterType() const = 0;

[ddorwin, 2014/08/26 00:42:40]

This is Blink style. Even though it's not a member, we can probably use
getter_style(). But, you could also just name it GetResolveParameterType().

[jrummell, 2014/08/26 17:02:45]

changed to GetResolveParameterType().

+
  protected:
   CdmPromise();
   CdmPromise(PromiseRejectedCB reject_cb);
@@ -80,6 +88,7 @@ class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
                      const std::string& uma_name);
   virtual ~CdmPromiseTemplate();
   virtual void resolve(const T& result);
+  virtual ResolveParameterType resolveParameterType() const OVERRIDE;
 
  protected:
   // Allow subclasses to completely override the implementation.
@@ -104,6 +113,7 @@ class MEDIA_EXPORT CdmPromiseTemplate<void> : public CdmPromise {
                      const std::string& uma_name);
   virtual ~CdmPromiseTemplate();
   virtual void resolve();
+  virtual ResolveParameterType resolveParameterType() const OVERRIDE;
 
  protected:
   // Allow subclasses to completely override the implementation.